diff --git a/package/jimmy/nullmailer/config.in b/package/jimmy/nullmailer/config.in
index ad8903716..df79112ff 100644
--- a/package/jimmy/nullmailer/config.in
+++ b/package/jimmy/nullmailer/config.in
@@ -25,6 +25,8 @@ then
 	menu_begin MENU_PKG_NULLMAILER 'Nullmailer Options'
 		bool 'Send all local mail to a local mbox' \
 			ROCKCFG_PKG_NULLMAILER_LOCALQUEUE 0
+		bool 'Add self-daemonizing behavior' \
+			ROCKCFG_PKG_NULLMAILER_DAEMONIZE  1
 	menu_end
 fi
 
diff --git a/package/jimmy/nullmailer/daemon.patch b/package/jimmy/nullmailer/daemon.diff
similarity index 100%
rename from package/jimmy/nullmailer/daemon.patch
rename to package/jimmy/nullmailer/daemon.diff
diff --git a/package/jimmy/nullmailer/nullmailer.conf b/package/jimmy/nullmailer/nullmailer.conf
index 9ec106c8d..efe6030b9 100644
--- a/package/jimmy/nullmailer/nullmailer.conf
+++ b/package/jimmy/nullmailer/nullmailer.conf
@@ -21,7 +21,7 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 nullmailer_prepatch() {
-	if test "$ROCKCFG_PKG_NULLMAILER_LOCALQUEUE" != 0 ; then
+	if [ "$ROCKCFG_PKG_NULLMAILER_LOCALQUEUE" == "1" ]; then
 		patch $patchopt < $archdir/nullmail-lq-$ver.diff
 		mkdir -p $root/home/nullmail/mail
 		chown -R 38:38 $root/home/nullmail
@@ -56,3 +56,6 @@ prepatch=nullmailer_prepatch
 premake=nullmailer_premake
 postmake=nullmailer_postmake
 
+if [ "$ROCKCFG_PKG_NULLMAILER_DAEMONIZE" == "1" ]; then
+	var_append patchfiles $confdir/daemon.diff
+fi