diff --git a/aria2/Makefile b/aria2/Makefile
index 22ed137a8..25d7883e1 100644
--- a/aria2/Makefile
+++ b/aria2/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aria2
 PKG_VERSION:=1.37.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/
@@ -112,7 +112,7 @@ endef
 
 define Package/aria2/postinst
 #!/bin/sh
-[ -x /usr/share/aria2//tracker.sh ] && (cd /usr/share/aria2 && sh ./tracker.sh >/dev/null 2>&1 &) || exit 0
+[ -x $${IPKG_INSTROOT}/usr/share/aria2//tracker.sh ] && (cd $${IPKG_INSTROOT}/usr/share/aria2 && sh ./tracker.sh >/dev/null 2>&1 &) || exit 0
 endef
 
 define Package/aria2/install
diff --git a/autoshare-ksmbd/Makefile b/autoshare-ksmbd/Makefile
deleted file mode 100644
index face98fc7..000000000
--- a/autoshare-ksmbd/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2010-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=autoshare-ksmbd
-PKG_VERSION:=1
-PKG_RELEASE:=2
-PKG_ARCH:=all
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/autoshare-ksmbd
-  TITLE:=Samba autoconfig hotplug script.
-  MAINTAINER:=Lean
-  DEPENDS:=+wsdd2
-endef
-
-define Package/autoshare-ksmbd/description
-A hotplug script to config Samba share automatically.
-endef
-
-define Build/Compile
-endef
-
-define Package/autoshare-ksmbd/install
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/block
-	$(INSTALL_BIN) ./files/20-smb-ksmbd $(1)/etc/hotplug.d/block/20-smb-ksmbd
-endef
-
-$(eval $(call BuildPackage,autoshare-ksmbd))
diff --git a/autoshare-samba/Makefile b/autoshare-samba/Makefile
deleted file mode 100644
index 09198a70a..000000000
--- a/autoshare-samba/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2010-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=autoshare-samba
-PKG_VERSION:=1
-PKG_RELEASE:=2
-PKG_ARCH:=all
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/autoshare-samba
-  TITLE:=Samba autoconfig hotplug script.
-  MAINTAINER:=Lean
-  DEPENDS:=+wsdd2
-endef
-
-define Package/autoshare-samba/description
-A hotplug script to config Samba share automatically.
-endef
-
-define Build/Compile
-endef
-
-define Package/autoshare-samba/install
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/block
-	$(INSTALL_BIN) ./files/20-smb $(1)/etc/hotplug.d/block/20-smb
-endef
-
-$(eval $(call BuildPackage,autoshare-samba))
diff --git a/luci-app-ksmbd/Makefile b/luci-app-ksmbd/Makefile
index 2282dedbc..e0a8e84ed 100644
--- a/luci-app-ksmbd/Makefile
+++ b/luci-app-ksmbd/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Network Shares - Ksmbd the SMB kernel fileserver
-LUCI_DEPENDS:=+luci-base +ksmbd-server +autoshare-ksmbd
+LUCI_DEPENDS:=+luci-base +ksmbd-server
 
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Richard Yu <yurichard3839@gmail.com>
diff --git a/autoshare-ksmbd/files/20-smb-ksmbd b/luci-app-ksmbd/root/etc/hotplug.d/block/20-smb-ksmbd
similarity index 100%
rename from autoshare-ksmbd/files/20-smb-ksmbd
rename to luci-app-ksmbd/root/etc/hotplug.d/block/20-smb-ksmbd
diff --git a/luci-app-ksmbd/root/etc/uci-defaults/luci-ksmbd b/luci-app-ksmbd/root/etc/uci-defaults/luci-ksmbd
new file mode 100644
index 000000000..e705e00bf
--- /dev/null
+++ b/luci-app-ksmbd/root/etc/uci-defaults/luci-ksmbd
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+chmod +x /etc/hotplug.d/block/20-smb-ksmbd
+
+exit 0
diff --git a/luci-app-samba4/Makefile b/luci-app-samba4/Makefile
index 05bcd3005..98c2ed98f 100644
--- a/luci-app-samba4/Makefile
+++ b/luci-app-samba4/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Network Shares - Samba 4 SMB/CIFS fileserver
-LUCI_DEPENDS:=+luci-base +samba4-server +autoshare-samba
+LUCI_DEPENDS:=+luci-base +samba4-server
 
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
diff --git a/autoshare-samba/files/20-smb b/luci-app-samba4/root/etc/hotplug.d/block/20-smb
similarity index 100%
rename from autoshare-samba/files/20-smb
rename to luci-app-samba4/root/etc/hotplug.d/block/20-smb
diff --git a/luci-app-samba4/root/etc/uci-defaults/luci-samba4 b/luci-app-samba4/root/etc/uci-defaults/luci-samba4
new file mode 100644
index 000000000..5642b7931
--- /dev/null
+++ b/luci-app-samba4/root/etc/uci-defaults/luci-samba4
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+chmod +x /etc/hotplug.d/block/20-smb
+
+exit 0