diff --git a/README.md b/README.md
index a09c29d..790a100 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- 0.5.1: v2014.3.1
 - 0.5: v2014.3
 - 0.4.2: v2014.2
  - note: no gluon fork used anymore
diff --git a/site.conf b/site.conf
index e21b9f8..dd271a7 100644
--- a/site.conf
+++ b/site.conf
@@ -8,7 +8,7 @@
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
-	opkg_repo = 'http://opkg.services.ffki/attitude_adjustment/12.09/%S/packages', -- ffki ipv6 mirror
+	opkg_repo = 'http://opkg.services.ffhh/attitude_adjustment/12.09/%S/packages',
 	regdom = 'DE',
 
 	wifi24 = {
@@ -36,90 +36,63 @@
 	},
 
 	fastd_mesh_vpn = {
+		enabled = true,
 		methods = {'salsa2012+gmac'},
-		mtu = 1426,
+		mtu = 1406,
 		backbone = {
 			limit = 2,
 			peers = {
 				gateway01 = {
 					key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58',
-					remotes = {'ipv4 "gw01.hamburg.freifunk.net" port 10000'},
+					remotes = {'"gw01.hamburg.freifunk.net" port 10000'},
 				},
 				gateway02 = {
-					key = 'a859bd669358c0bbef4f23b3a803bc5cac37a635fec11babacd9278f2ca86841', -- regenerate key before release
-					remotes = {'ipv4 "gw02.hamburg.freifunk.net" port 10000'},
+					key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+					remotes = {'"gw02.hamburg.freifunk.net" port 10000'},
 				},
 				gateway03 = {
-					key = '49fc60a3d0a7e73d1fce1d002f2644509997f6a188b86ce3ecbaa1a9ccd14b1f', -- regenerate key before release
-					remotes = {'ipv4 "gw03.hamburg.freifunk.net" port 10000'},
+					key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+					remotes = {'"gw03.hamburg.freifunk.net" port 10000'},
 				},
 				gateway04 = {
-					key = 'd794faee2391d1636b8f827e6cb1616360b31705980c3c512ea14ea2ebc17e5a', -- regenerate key before release
-					remotes = {'ipv4 "gw04.hamburg.freifunk.net" port 10000'},
+					key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf',
+					remotes = {'"gw04.hamburg.freifunk.net" port 10000'},
 				},
 				gateway05 = {
 					key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5',
-					remotes = {'ipv4 "gw05.hamburg.freifunk.net" port 10000'},
+					remotes = {'"gw05.hamburg.freifunk.net" port 10001'},
 				},
 				gateway06 = {
-					key = '2dc0ecf682dd786a4b44f0e4daab052202807adc0227fef64d9ccef0814ce88c', -- regenerate key before release
-					remotes = {'ipv4 "gw06.hamburg.freifunk.net" port 10000'},
+					key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6',
+					remotes = {'"gw06.hamburg.freifunk.net" port 10000'},
 				},
 				gateway07 = {
 					key = '62ea83b5fbb0fd8cf205f1398698cb29180039b8246b1f69778e8f52cd423612',
-					remotes = {'ipv4 "gw07.hamburg.freifunk.net" port 10000'},
+					remotes = {'"gw07.hamburg.freifunk.net" port 10001'},
 				},
 				gateway08 = {
 					key = '67e9b215248ada3f4ffcc9db0bdf897128f6236a0d4e8d660762b77bebc914d4',
-					remotes = {'ipv4 "gw08.hamburg.freifunk.net" port 10000'},
+					remotes = {'"gw08.hamburg.freifunk.net" port 10001'},
 				},
 				gateway09 = {
 					key = '5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc',
-					remotes = {'ipv4 "gw09.hamburg.freifunk.net" port 10000'},
+					remotes = {'"gw09.hamburg.freifunk.net" port 10001'},
 				},
 				gateway10 = {
-					key = '878de7af33ca09753610d9bc7c9b0113ddb9cc879913d4939dfda117d100336f', -- regenerate key before release
-					remotes = {'ipv4 "gw10.hamburg.freifunk.net" port 10000'},
+					key = '69c0bafd5c08d4277b339483cf137fe7e732b5bc87c8fbdb636ff7767426b94b',
+					remotes = {'"gw10.hamburg.freifunk.net" port 10000'},
 				},
 				gateway11 = {
-					key = 'b2df3c5b5106629aedb55927889129823a0da023d1ed0441fab2090046042c7c',
-					remotes = {'ipv4 "gw11.hamburg.freifunk.net" port 10000'},
+					key = 'ee7719551bdba725c27a60a031f2faeb44588162c8065a1c651d35b3c9ebc347',
+					remotes = {'"gw11.hamburg.freifunk.net" port 10000'},
 				},
 				gateway12 = {
 					key = 'facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524',
-					remotes = {'ipv4 "gw12.hamburg.freifunk.net" port 10000'},
+					remotes = {'"gw12.hamburg.freifunk.net" port 10001'},
 				},
 				gateway13 = {
 					key = 'd5556881159c7bc649caabf0a72ba7c33ca8bb5fd0c7f21d52f8cbd071185e28',
-					remotes = {'ipv4 "gw13.hamburg.freifunk.net" port 10000'},
-				},
-				gateway14 = {
-					key = '259aef981f51bdb99394f7d9e9fff55db84530300e6be600715aae1695a578a2',
-					remotes = {'ipv4 "gw14.hamburg.freifunk.net" port 10000'},
-				},
-				gateway15 = {
-					key = '05e5ccf23505f9c542b6096e08d7299635984c22237b1aaf773689fe09360bea',
-					remotes = {'ipv4 "gw15.hamburg.freifunk.net" port 10000'},
-				},
-				gateway16 = {
-					key = 'db11ac9b98479458acf927d501dc8cd4d2a8ec86c9c912ee8f9e1600a01f3c14',
-					remotes = {'ipv4 "gw16.hamburg.freifunk.net" port 10000'},
-				},
-				gateway17 = {
-					key = '47a0ec3055fcc71bf5534287aa832944623747f583f32cf5f9fe26947c278176',
-					remotes = {'ipv4 "gw17.hamburg.freifunk.net" port 10000'},
-				},
-				gateway18 = {
-					key = 'e256557a0df457283407b7e31decd5767be21b6e9835d8b754b63b91748d1764',
-					remotes = {'ipv4 "gw18.hamburg.freifunk.net" port 10000'},
-				},
-				gateway19 = {
-					key = 'b1e4a847fd9bb285dacef321c82b8ba4ab220706d4deb58f05b06ff8c55451f1',
-					remotes = {'ipv4 "gw19.hamburg.freifunk.net" port 10000'},
-				},
-				gateway20 = {
-					key = 'a5b6d39c0f8877938963b988bc062f212ab2df002760da647b8173b5d81b0329',
-					remotes = {'ipv4 "gw20.hamburg.freifunk.net" port 10000'},
+					remotes = {'"gw13.hamburg.freifunk.net" port 10001'},
 				},
 			},
 		},
@@ -175,6 +148,7 @@
 Willkommen zum Einrichtungsassistenten für deinen neuen Hamburger
 Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen
 entsprechend aus und sende es ab.
+Den unten anzugebenden Knotennamen kannst du beliebig wählen. Denke Dir also etwas schönes aus. Er ist der Name des Knotens im Netzwerk und hat nichts mit dem ausgestrahlten Netzwerknamen (SSID) zu tun. Letzterer ist immer hamburg.freifunk.net.
 ]],
                 msg_nopubkey = [[
 Bitte trage nun den Namen deines Knotens
diff --git a/site.mk b/site.mk
index 072cd29..d16312a 100644
--- a/site.mk
+++ b/site.mk
@@ -19,7 +19,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.5
+DEFAULT_GLUON_RELEASE := 0.5.2
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)