diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35183d5..5e1d2c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Freifunk München Firmware Changelog
 
+## v2015.6.1
+ * Added support of site selection in config mode
+ * Switch autoupdater URL back to main firmware repo path
+
 ## v2015.6
  - Updated to Gluon 2015.1.2
    - Changes: https://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html
diff --git a/extra/ffmuc_umland.conf b/extra/ffmuc_umland.conf
index a5ecdbd..30d53e2 100644
--- a/extra/ffmuc_umland.conf
+++ b/extra/ffmuc_umland.conf
@@ -92,8 +92,8 @@
       stable = {
         name = 'stable',
         mirrors = {
-          'http://firmware.ffmuc.net/umland/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/umland/stable/sysupgrade/',
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
         },
         probability = 0.1,
         good_signatures = 2,
@@ -107,8 +107,8 @@
       experimental = {
         name = 'experimental',
         mirrors = {
-          'http://firmware.ffmuc.net/umland/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/umland/experimental/sysupgrade/',
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
         },
         probability = 0.5,
         good_signatures = 2,
diff --git a/extra/ffmuc_welcome.conf b/extra/ffmuc_welcome.conf
index 9e17be4..122f1c6 100644
--- a/extra/ffmuc_welcome.conf
+++ b/extra/ffmuc_welcome.conf
@@ -85,8 +85,8 @@
       stable = {
         name = 'stable',
         mirrors = {
-          'http://firmware.ffmuc.net/welcome/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/welcome/stable/sysupgrade/',
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
         },
         probability = 0.1,
         good_signatures = 2,
@@ -100,8 +100,8 @@
       experimental = {
         name = 'experimental',
         mirrors = {
-          'http://firmware.ffmuc.net/welcome/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/welcome/experimental/sysupgrade/',
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
         },
         probability = 0.5,
         good_signatures = 2,