diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 1914f12991..6456dfbf5a 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -108,19 +108,19 @@ define Package/openvpn-$(BUILD_VARIANT)/install
 
 	$(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
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