diff --git a/Makefile b/Makefile
index 66e7b08cf7..cf84944fa9 100644
--- a/Makefile
+++ b/Makefile
@@ -965,7 +965,7 @@ env:
 
 cleantest:
 	@if cmp -s .cleancount .lastclean ; then echo ; else \
-		$(MAKE) dist-clean; cp -f .cleancount .lastclean;\
+		$(MAKE) clean; cp -f .cleancount .lastclean;\
 	fi
 
 _uninstall:
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h
index 9ee20bc5ae..f4db2a6870 100755
--- a/build_tools/make_buildopts_h
+++ b/build_tools/make_buildopts_h
@@ -7,7 +7,7 @@ cat << END
  */
 
 END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g`
+TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g`
 for x in ${TMP}; do
      echo "#define ${x}"
 done