diff --git a/TODO b/TODO
index 7962b9ecf..f28928626 100644
--- a/TODO
+++ b/TODO
@@ -3,11 +3,6 @@ is listed here doesn't mean that it is going to be added to busybox,
 or that doing so is even a good idea. It just means that I _might_ get
 around to it some time. If you have any good ideas, please let me know.
 
-* login/sulogin/passwd/etc are part of tinylogin.  We are in the
-    process of merging these applications into busybox, since the 
-    new build system allows us to add Libraries (i.e. libcrypt),
-    when certain applets are enabled.
-
 * We _were_ going to split networking apps into a new package called 
     netkit-tiny.  Per discussions on the mailing list, this isn't going
     to happen.  False alarm.  Sorry about the confusion.  
@@ -18,10 +13,7 @@ around to it some time. If you have any good ideas, please let me know.
 
 Possible apps to include some time:
 
-* hwclock
 * group/commonize strings, remove dups (for i18n, l10n)
-* login/sulogin/passwd/etc are part of tinylogin.  These are 
-    being merged into busybox as time allows.
 
 -----------
 
@@ -48,10 +40,6 @@ libraries such as uClibc.
 Compile with debugging on, run 'nm --size-sort ./busybox'
 and then start with the biggest things and make them smaller...
 
------------------------
-
- du.c probably ought to have an -x switch like GNU du does...
-
 -----------------------
 
 xargs could use a -l option
diff --git a/include/applets.h b/include/applets.h
index de393be8f..75f5436b0 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -107,10 +107,10 @@
 #ifdef CONFIG_CPIO
 	APPLET(cpio, cpio_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef BB_CROND
+#ifdef CONFIG_CROND
 	APPLET(crond, crond_main, _BB_DIR_USR_SBIN)
 #endif
-#ifdef BB_CRONTAB
+#ifdef CONFIG_CRONTAB
 	APPLET(crontab, crontab_main, _BB_DIR_USR_BIN)
 #endif
 #ifdef CONFIG_CUT