diff --git a/Makefile b/Makefile
index d9b9c8c..ea85770 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ define Package/olsrd/install
 	install -d -m0755 $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(1)/usr/sbin/
 	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/olsrd.init $(1)/etc/init.d/S60olsrd
+	install -m0755 ./files/olsrd.init $(1)/etc/init.d/olsrd
 endef
 
 define Package/olsrd-mod-dot-draw/install
diff --git a/files/olsrd.init b/files/olsrd.init
index f59ff7e..3cdd6ae 100644
--- a/files/olsrd.init
+++ b/files/olsrd.init
@@ -2,9 +2,9 @@
 # Copyright (C) 2006 OpenWrt.org
 
 DEFAULT=/etc/default/olsrd
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+	[ -f $DEFAULT ] && . $DEFAULT
 	olsrd $OPTIONS
 }