diff --git a/Makefile b/Makefile
index 706bf332..63381696 100644
--- a/Makefile
+++ b/Makefile
@@ -463,8 +463,6 @@ apps/$(DROPBEAR)/configure:
 	tar -C apps -xjf apps/$(DROPBEAR).tar.bz2
 
 apps/$(DROPBEAR)/dropbear: apps/$(DROPBEAR)/configure
-	@echo "#define DEFAULT_PATH \"/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin\"" \
-	  > apps/$(DROPBEAR)/localoptions.h
 	cd apps/$(DROPBEAR) && \
 	  CC=$(TOOLCHAIN)/bin/sh4-linux-gcc \
 	./configure \
@@ -475,6 +473,9 @@ apps/$(DROPBEAR)/dropbear: apps/$(DROPBEAR)/configure
           --disable-utmpx \
           --disable-wtmp \
           --disable-wtmpx
+	sed -e 's/DEFAULT_PATH \"\/usr\/bin:\/bin\"/DEFAULT_PATH \"\/sbin:\/usr\/sbin:\/bin:\/usr\/bin:\/usr\/local\/bin\"/g' \
+	  < apps/$(DROPBEAR)/options.h > apps/$(DROPBEAR)/options.h.2
+	mv apps/$(DROPBEAR)/options.h.2 apps/$(DROPBEAR)/options.h
 	make -C apps/$(DROPBEAR) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
 
 .PHONY: dropbear
diff --git a/fs-add/etc/init.d/dropbear b/fs-add/etc/init.d/dropbear
index 1af2da19..c9bee1f2 100755
--- a/fs-add/etc/init.d/dropbear
+++ b/fs-add/etc/init.d/dropbear
@@ -24,4 +24,4 @@ if test -r /etc/sysconfig/authorized_keys ; then
   cp /etc/sysconfig/authorized_keys $HOME/.ssh/authorized_keys
   chmod 0600 $HOME/.ssh/authorized_keys
 fi
-exec dropbear -F -b /etc/motd
+exec dropbear -F