diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index dd60e700f21ce..cc34f4ff1debe 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn
 
 PKG_VERSION:=2.6.14
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE_URL:=\
 	https://build.openvpn.net/downloads/releases/ \
@@ -91,45 +91,42 @@ define Build/Configure
 endef
 
 define Package/openvpn-$(BUILD_VARIANT)/install
-	$(INSTALL_DIR) \
-		$(1)/usr/sbin \
-		$(1)/usr/share/openvpn \
-		$(1)/etc/init.d \
-		$(1)/etc/config \
-		$(1)/etc/openvpn \
-		$(1)/etc/uci-defaults \
-		$(1)/lib/functions \
-		$(1)/lib/netifd/proto \
-		$(1)/lib/upgrade/keep.d \
-		$(1)/usr/libexec \
-		$(1)/etc/hotplug.d/openvpn
-
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) \
 		$(PKG_INSTALL_DIR)/usr/sbin/openvpn \
 		$(1)/usr/sbin/
 
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
 	$(INSTALL_BIN) \
 		files/lib/netifd/proto/openvpn.sh \
 		$(1)/lib/netifd/proto/
 
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) \
 		files/etc/uci-defaults/60_openvpn_migrate.sh \
 		$(1)/etc/uci-defaults/
 
+	$(INSTALL_DIR) $(1)/usr/share/openvpn
 	$(INSTALL_DATA) \
-		files/openvpn.options \
-		$(1)/usr/share/openvpn/openvpn.options
-
+		files/usr/share/openvpn/openvpn.options \
+		$(1)/usr/share/openvpn/
 	$(INSTALL_BIN) \
-		files/up.uc files/down.uc files/route-pre-down.uc files/route-up.uc \
-		files/ipchange.uc \
-		files/client-connect.uc files/client-disconnect.uc files/client-crresponse.uc \
-		files/auth-user-pass-verify.uc files/tls-verify.uc \
+		files/usr/share/openvpn/up.uc \
+		files/usr/share/openvpn/down.uc \
+		files/usr/share/openvpn/route-pre-down.uc \
+		files/usr/share/openvpn/route-up.uc \
+		files/usr/share/openvpn/ipchange.uc \
+		files/usr/share/openvpn/client-connect.uc \
+		files/usr/share/openvpn/client-disconnect.uc \
+		files/usr/share/openvpn/client-crresponse.uc \
+		files/usr/share/openvpn/auth-user-pass-verify.uc \
+		files/usr/share/openvpn/tls-verify.uc \
 		$(1)/usr/share/openvpn/
 
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DATA) \
-		files/openvpn.sysupgrade \
-		$(1)/lib/upgrade/keep.d/openvpn
+		files/lib/upgrade/keep.d/openvpn \
+		$(1)/lib/upgrade/keep.d/
 endef
 
 $(eval $(call BuildPackage,openvpn-openssl))
diff --git a/net/openvpn/files/openvpn.sysupgrade b/net/openvpn/files/lib/upgrade/keep.d/openvpn
similarity index 100%
rename from net/openvpn/files/openvpn.sysupgrade
rename to net/openvpn/files/lib/upgrade/keep.d/openvpn
diff --git a/net/openvpn/files/auth-user-pass-verify.uc b/net/openvpn/files/usr/share/openvpn/auth-user-pass-verify.uc
similarity index 100%
rename from net/openvpn/files/auth-user-pass-verify.uc
rename to net/openvpn/files/usr/share/openvpn/auth-user-pass-verify.uc
diff --git a/net/openvpn/files/client-connect.uc b/net/openvpn/files/usr/share/openvpn/client-connect.uc
similarity index 100%
rename from net/openvpn/files/client-connect.uc
rename to net/openvpn/files/usr/share/openvpn/client-connect.uc
diff --git a/net/openvpn/files/client-crresponse.uc b/net/openvpn/files/usr/share/openvpn/client-crresponse.uc
similarity index 100%
rename from net/openvpn/files/client-crresponse.uc
rename to net/openvpn/files/usr/share/openvpn/client-crresponse.uc
diff --git a/net/openvpn/files/client-disconnect.uc b/net/openvpn/files/usr/share/openvpn/client-disconnect.uc
similarity index 100%
rename from net/openvpn/files/client-disconnect.uc
rename to net/openvpn/files/usr/share/openvpn/client-disconnect.uc
diff --git a/net/openvpn/files/down.uc b/net/openvpn/files/usr/share/openvpn/down.uc
similarity index 100%
rename from net/openvpn/files/down.uc
rename to net/openvpn/files/usr/share/openvpn/down.uc
diff --git a/net/openvpn/files/ipchange.uc b/net/openvpn/files/usr/share/openvpn/ipchange.uc
similarity index 100%
rename from net/openvpn/files/ipchange.uc
rename to net/openvpn/files/usr/share/openvpn/ipchange.uc
diff --git a/net/openvpn/files/openvpn.options b/net/openvpn/files/usr/share/openvpn/openvpn.options
similarity index 100%
rename from net/openvpn/files/openvpn.options
rename to net/openvpn/files/usr/share/openvpn/openvpn.options
diff --git a/net/openvpn/files/route-pre-down.uc b/net/openvpn/files/usr/share/openvpn/route-pre-down.uc
similarity index 100%
rename from net/openvpn/files/route-pre-down.uc
rename to net/openvpn/files/usr/share/openvpn/route-pre-down.uc
diff --git a/net/openvpn/files/route-up.uc b/net/openvpn/files/usr/share/openvpn/route-up.uc
similarity index 100%
rename from net/openvpn/files/route-up.uc
rename to net/openvpn/files/usr/share/openvpn/route-up.uc
diff --git a/net/openvpn/files/tls-verify.uc b/net/openvpn/files/usr/share/openvpn/tls-verify.uc
similarity index 100%
rename from net/openvpn/files/tls-verify.uc
rename to net/openvpn/files/usr/share/openvpn/tls-verify.uc
diff --git a/net/openvpn/files/up.uc b/net/openvpn/files/usr/share/openvpn/up.uc
similarity index 100%
rename from net/openvpn/files/up.uc
rename to net/openvpn/files/usr/share/openvpn/up.uc