diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf
index 82be554..b41d3a6 100644
--- a/extra/ffmuc.conf
+++ b/extra/ffmuc.conf
@@ -2,7 +2,10 @@
   hostname_prefix = '',
   site_name = 'Freifunk München',
   site_code = 'ffmuc',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
 
   prefix4 = '10.80.32.0/19',
   prefix6 = 'fdef:ffc0:4fff::/64',
diff --git a/extra/ffmuc_umland.conf b/extra/ffmuc_umland.conf
index f78c15f..4ab4572 100644
--- a/extra/ffmuc_umland.conf
+++ b/extra/ffmuc_umland.conf
@@ -2,7 +2,10 @@
   hostname_prefix = '',
   site_name = 'Freifunk München Umland',
   site_code = 'ffmuc_umland',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
 
   prefix4 = '10.80.96.0/19',
   prefix6 = 'fdef:ffc0:4fff:2::/64',
diff --git a/extra/ffmuc_welcome.conf b/extra/ffmuc_welcome.conf
index 3e176cf..259be64 100644
--- a/extra/ffmuc_welcome.conf
+++ b/extra/ffmuc_welcome.conf
@@ -2,7 +2,10 @@
   hostname_prefix = 'welcome',
   site_name = 'Freifunk München Welcome',
   site_code = 'ffmuc_welcome',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
 
   prefix4 = '10.80.64.0/19',
   prefix6 = 'fdef:ffc0:4fff:1::/64',
diff --git a/site.conf b/site.conf
index 82be554..b41d3a6 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,10 @@
   hostname_prefix = '',
   site_name = 'Freifunk München',
   site_code = 'ffmuc',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
 
   prefix4 = '10.80.32.0/19',
   prefix6 = 'fdef:ffc0:4fff::/64',