diff --git a/utils/wifitoggle/Makefile b/utils/wifitoggle/Makefile
index 017b3def3..cfca4b7ac 100644
--- a/utils/wifitoggle/Makefile
+++ b/utils/wifitoggle/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifitoggle
 PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,7 +33,10 @@ define Build/Compile
 endef
 
 define Package/wifitoggle/install
-	$(CP) ./files/* $(1)
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/button
+	$(INSTALL_BIN) ./files/hotplug_wifitoggle $(1)/etc/hotplug.d/button/50-wifitoggle
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/uci_wifitoggle $(1)/etc/config/wifitoggle
 endef
 
 $(eval $(call BuildPackage,wifitoggle))
diff --git a/utils/wifitoggle/files/etc/hotplug.d/button/30-wifitoggle b/utils/wifitoggle/files/hotplug-wifitoggle
similarity index 100%
rename from utils/wifitoggle/files/etc/hotplug.d/button/30-wifitoggle
rename to utils/wifitoggle/files/hotplug-wifitoggle
diff --git a/utils/wifitoggle/files/etc/config/wifitoggle b/utils/wifitoggle/files/uci_wifitoggle
similarity index 100%
rename from utils/wifitoggle/files/etc/config/wifitoggle
rename to utils/wifitoggle/files/uci_wifitoggle