diff --git a/README.txt b/README.txt
index cfcd37b29..8dfaf1093 100644
--- a/README.txt
+++ b/README.txt
@@ -107,7 +107,7 @@ This will select the apps/examples/hello in the following way:
 - examples/Make.defs will set CONFIGURED_APPS += $(APPDIR)/examples/hello
   like this:
 
-  ifeq ($(CONFIG_EXAMPLES_HELLO),y)
+  ifneq ($(CONFIG_EXAMPLES_HELLO),)
   CONFIGURED_APPS += $(APPDIR)/examples/hello
   endif
 
@@ -141,7 +141,7 @@ to the project. One must:
 
  4b. The Make.defs file should include a line like:
 
-    ifeq ($(CONFIG_PROGNAME),y)
+    ifneq ($(CONFIG_PROGNAME),)
     CONFIGURED_APPS += progname
     endif
 
diff --git a/examples/embedlog/Make.defs b/examples/embedlog/Make.defs
index 321f85365..26aeae6e1 100644
--- a/examples/embedlog/Make.defs
+++ b/examples/embedlog/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_EXAMPLES_EMBEDLOG),y)
+ifneq ($(CONFIG_EXAMPLES_EMBEDLOG),)
 CONFIGURED_APPS += $(APPDIR)/examples/embedlog
 endif
diff --git a/examples/ina226/Make.defs b/examples/ina226/Make.defs
index b9c1a383f..8da354ece 100644
--- a/examples/ina226/Make.defs
+++ b/examples/ina226/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_EXAMPLES_INA226),y)
+ifneq ($(CONFIG_EXAMPLES_INA226),)
 CONFIGURED_APPS += $(APPDIR)/examples/ina226
 endif
diff --git a/examples/ini_dumper/Make.defs b/examples/ini_dumper/Make.defs
index 3bae84c21..632f848b6 100644
--- a/examples/ini_dumper/Make.defs
+++ b/examples/ini_dumper/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_EXAMPLES_INI_DUMPER),y)
+ifneq ($(CONFIG_EXAMPLES_INI_DUMPER),)
 CONFIGURED_APPS += $(APPDIR)/examples/ini_dumper
 endif
diff --git a/examples/modbusmaster/Make.defs b/examples/modbusmaster/Make.defs
index f2eb95d34..497e3b2f9 100644
--- a/examples/modbusmaster/Make.defs
+++ b/examples/modbusmaster/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_EXAMPLES_MODBUSMASTER),y)
+ifneq ($(CONFIG_EXAMPLES_MODBUSMASTER),)
 CONFIGURED_APPS += $(APPDIR)/examples/modbusmaster
 endif
diff --git a/graphics/nxwidgets/UnitTests/CButton/Make.defs b/graphics/nxwidgets/UnitTests/CButton/Make.defs
index 53961fb82..d60092fa7 100644
--- a/graphics/nxwidgets/UnitTests/CButton/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CButton/Make.defs
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTON),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTON),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CButton
 endif
 
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs b/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs
index 714679f1b..5d487a0f5 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CButtonArray
 endif
 
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs b/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs
index ade190e4a..11c23c16e 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CCHECKBOX),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CCHECKBOX),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CCheckBox
 endif
 
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs b/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs
index e68f2933b..e22279cdf 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CGlyphButton
 endif
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
index 6c656e78e..685d21e23 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CGlyphSliderHorizontal
 endif
 
diff --git a/graphics/nxwidgets/UnitTests/CImage/Make.defs b/graphics/nxwidgets/UnitTests/CImage/Make.defs
index 968cb4634..11c909864 100644
--- a/graphics/nxwidgets/UnitTests/CImage/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CImage/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CIMAGE),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CIMAGE),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CImage
 endif
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/Make.defs b/graphics/nxwidgets/UnitTests/CKeypad/Make.defs
index 82d678388..f86e7c3e4 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CKeypad/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CKEYPAD),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CKEYPAD),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CKeypad
 endif
diff --git a/graphics/nxwidgets/UnitTests/CLabel/Make.defs b/graphics/nxwidgets/UnitTests/CLabel/Make.defs
index 20d0e5174..44b011b5e 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CLabel/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLABEL),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CLABEL),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CLabel
 endif
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs b/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs
index 603046d0a..33354fb79 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CLatchButton
 endif
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs
index c02be9d03..1260f18cd 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CLatchButtonArray
 endif
 
diff --git a/graphics/nxwidgets/UnitTests/CListBox/Make.defs b/graphics/nxwidgets/UnitTests/CListBox/Make.defs
index c5afec066..5ac3f71c6 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CListBox/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLISTBOX),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CLISTBOX),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CListBox
 endif
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs b/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs
index 1f83d930c..3ef4c0333 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CProgressBar
 endif
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs b/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs
index dc855a5f7..ddf825574 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CRadioButton
 endif
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs
index 2fc41a75e..27525481f 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CScrollbarHorizontal
 endif
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs
index 884ff3551..b41946961 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CScrollbarVertical
 endif
 
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs
index 4619bdc00..5fc73e78f 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CSliderHorizonal
 endif
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs b/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs
index 37ddd990a..99abb633b 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CSliderVertical
 endif
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/Make.defs b/graphics/nxwidgets/UnitTests/CTextBox/Make.defs
index 0d662db8a..1189f385c 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CTextBox/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX),y)
+ifneq ($(CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwidget/UnitTests/CTextBox
 endif
diff --git a/graphics/nxwm/Make.defs b/graphics/nxwm/Make.defs
index adbbb6bff..f19664149 100644
--- a/graphics/nxwm/Make.defs
+++ b/graphics/nxwm/Make.defs
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NXWM),y)
+ifneq ($(CONFIG_NXWM),)
 CONFIGURED_APPS += $(APPDIR)/graphics/nxwm
 endif
 
diff --git a/graphics/twm4nx/Make.defs b/graphics/twm4nx/Make.defs
index 0932cb9ce..e66c5dcce 100644
--- a/graphics/twm4nx/Make.defs
+++ b/graphics/twm4nx/Make.defs
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_GRAPHICS_TWM4NX),y)
+ifneq ($(CONFIG_GRAPHICS_TWM4NX),)
 CONFIGURED_APPS += $(APPDIR)/graphics/twm4nx
 endif
 
diff --git a/graphics/twm4nx/Makefile b/graphics/twm4nx/Makefile
index 5e7560ae1..287963a81 100644
--- a/graphics/twm4nx/Makefile
+++ b/graphics/twm4nx/Makefile
@@ -49,7 +49,7 @@ MODULE    = $(CONFIG_GRAPHICS_TWM4NX)
 
 # Twm4Nx
 
-CXXSRCS   = twm4nx_main.cxx
+MAINSRC   = twm4nx_main.cxx
 CXXSRCS  += cbackground.cxx cfonts.cxx ciconmgr.cxx ciconwidget.cxx
 CXXSRCS  += cmenus.cxx cmainmenu.cxx
 CXXSRCS  += cwindow.cxx cwindowevent.cxx cresize.cxx cwindowfactory.cxx
@@ -71,7 +71,7 @@ ifeq ($(CONFIG_TWM4NX_NXTERM),y)
 CXXSRCS  += cnxterm.cxx
 endif
 
-MAINSRC   = ctwm4nx.cxx
+CXXSRCS   = ctwm4nx.cxx
 
 VPATH     = src:apps
 
diff --git a/netutils/discover/Make.defs b/netutils/discover/Make.defs
index 2dae05402..d3b8b185a 100644
--- a/netutils/discover/Make.defs
+++ b/netutils/discover/Make.defs
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_NETUTILS_DISCOVER),)
+ifeq ($(CONFIG_NETUTILS_DISCOVER),y)
 CONFIGURED_APPS += $(APPDIR)/netutils/discover
 endif
 
diff --git a/netutils/ping/Make.defs b/netutils/ping/Make.defs
index e8c8c94c4..ef20e9004 100644
--- a/netutils/ping/Make.defs
+++ b/netutils/ping/Make.defs
@@ -34,4 +34,8 @@
 #
 ############################################################################
 
+ifeq ($(CONFIG_NETUTILS_PING),y)
 CONFIGURED_APPS += $(APPDIR)/netutils/ping
+else ifeq ($(CONFIG_NETUTILS_PING6),y)
+CONFIGURED_APPS += $(APPDIR)/netutils/ping
+endif
diff --git a/netutils/thttpd/Make.defs b/netutils/thttpd/Make.defs
index 3611b3a68..dd7923c73 100644
--- a/netutils/thttpd/Make.defs
+++ b/netutils/thttpd/Make.defs
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_NETUTILS_THTTPD),)
+ifeq ($(CONFIG_NETUTILS_THTTPD),y)
 CONFIGURED_APPS += $(APPDIR)/netutils/thttpd
 endif
 
diff --git a/nshlib/Make.defs b/nshlib/Make.defs
index 549ccdc92..1c85c0fa7 100644
--- a/nshlib/Make.defs
+++ b/nshlib/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_NSH_LIBRARY),)
+ifeq ($(CONFIG_NSH_LIBRARY),y)
 CONFIGURED_APPS += $(APPDIR)/nshlib
 endif
diff --git a/system/psmq/Make.defs b/system/psmq/Make.defs
index 5a61f188a..2e5c06d4c 100644
--- a/system/psmq/Make.defs
+++ b/system/psmq/Make.defs
@@ -33,6 +33,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_SYSTEM_PSMQ),y)
+ifneq ($(CONFIG_SYSTEM_PSMQ),)
 CONFIGURED_APPS += $(APPDIR)/system/psmq
 endif
diff --git a/system/termcurses/Make.defs b/system/termcurses/Make.defs
index b96d9eadb..44a25752e 100644
--- a/system/termcurses/Make.defs
+++ b/system/termcurses/Make.defs
@@ -33,6 +33,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_SYSTEM_TERMCURSES),)
+ifeq ($(CONFIG_SYSTEM_TERMCURSES),y)
 CONFIGURED_APPS += $(APPDIR)/system/termcurses
 endif