diff --git a/packages/network/connman/build b/packages/network/connman/build
index 33892a6ff7..5b3d64b059 100755
--- a/packages/network/connman/build
+++ b/packages/network/connman/build
@@ -75,4 +75,4 @@ cd $PKG_BUILD
             --enable-datafiles \
             --disable-silent-rules \
 
-make storagedir=/storage/.cache/connman vpn_storagedir=/storage/.cache/connman-vpn statedir=/run/connman
+make storagedir=/storage/.cache/connman vpn_storagedir=/storage/.config/vpn-config statedir=/run/connman
diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index fb4d5a9c4e..59370e7623 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -23,7 +23,7 @@
 # runlevels: openelec, textmode
 
 mkdir -p /storage/.cache/connman
-mkdir -p /storage/.cache/connman-vpn
+mkdir -p /storage/.config/vpn-config
 mkdir -p /run/connman
 
 # starting loopback device