diff --git a/loop-detector/Makefile b/loop-detector/Makefile
index 73637da59..fd5a670b2 100644
--- a/loop-detector/Makefile
+++ b/loop-detector/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=loop-detector
 PKG_VERSION:=1.0
 
-PKG_SOURCE_VERSION:=2e8584ae8a6d2e089f7a6db7628b218792a35c99
+PKG_SOURCE_VERSION:=c2c4b1de3315fe7b04460b57351b9ee9d3163bd7
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/loop-detector
 
@@ -39,8 +39,10 @@ CONFIGURE_ARGS += \
 define Package/loop-detector/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/loop-detector $(1)/sbin/
-	#$(INSTALL_DIR) $(1)/etc/config
-	#$(CP) $(PKG_BUILD_DIR)/config/loopDetect $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) ./files/loop_detection.init $(1)/etc/init.d/loop_detection
+	$(INSTALL_DIR) $(1)/etc/config
+	$(CP) ./files/loop_detection.config $(1)/etc/config/loop_detection
 endef
 
 $(eval $(call BuildPackage,loop-detector))
diff --git a/loop-detector/files/loop_detection.config b/loop-detector/files/loop_detection.config
new file mode 100644
index 000000000..eb3846e9f
--- /dev/null
+++ b/loop-detector/files/loop_detection.config
@@ -0,0 +1,5 @@
+config loop-detect loop
+	option enabled '1'
+	option discovery_interval '10'
+	option recovery_check_tries '5'
+
diff --git a/loop-detector/files/loop_detection.init b/loop-detector/files/loop_detection.init
new file mode 100755
index 000000000..03ceae37f
--- /dev/null
+++ b/loop-detector/files/loop_detection.init
@@ -0,0 +1,36 @@
+#!/bin/sh /etc/rc.common
+
+START=21
+STOP=89
+
+USE_PROCD=1
+NAME=loop-detector
+
+start_service() {
+	local enabled
+
+	config_load loop_detection
+	config_get_bool enabled loop enabled 1
+
+	if [ $enabled -eq 1 ]; then
+		procd_open_instance
+		procd_set_param command "/sbin/loop-detector"
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}
+
+stop() {
+	service_stop /sbin/loop-detector
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger loop-detect
+}
+
+reload_service() {
+	stop
+	start
+}
+