diff --git a/hosts/ehingen1 b/hosts/ehingen1
deleted file mode 100644
index 3c7d3ae..0000000
--- a/hosts/ehingen1
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = gw01.freifunk-ehingen.de
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAz1zcs2ZgiZRLVXQyqYXKD3+dx7imqN/cmJ6CYoSfxjesslWaS+qG
-29YH+U7qXSDgRyjVtdXdVHIa9dYSKff292H7yzX3LbHPsUEeq5kAAqqieTIsRYoI
-6QeUTYkfSuvkqmAe1zUmC5fcf8BRSu2YUHSWhM5Lu9ulWzXuKYoipnXgqQzVz67w
-3DnYEx/DEAxn4LKagOpUq+l9OzChOtMWeW1/MSCaEhm7VLYaY9YITdhb5U61PB7F
-fdv/77AhRBjL6zfNX6M9ZookKukAz3KHme5EzDYXVA4CiyBN+HMzgCYHbqopOiVZ
-BGjNAeO8FjAkBwn5Os608LOSocOEVz9KDwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/gadow b/hosts/gadow
deleted file mode 100644
index c9b26a8..0000000
--- a/hosts/gadow
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = freifunk-gadow.de
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAu4C4/nHeAvAUhUQeraE4Mpjl3WV6fFUpYCp0sNXYqlp36rZZiNnG
-tpwpOiAbAAx1yutT5UvJIc9/w9WctQNvnXfpvzpSwmT/7+4QA6e0gxFjvTbP5ymk
-Kptmi43KdLppCSMFGyH9rb1yVha9vWS0INBZbzAnZK39txTMntSp9YD7ek2fZr6o
-R+Np261OAd+fEhuG0BEoGXvJscrCK8QWSTlz+xIxJV+B0d/nXGshTiXqsziwDQRc
-aG7tG6jAPsqXxU7h7/QdHi3fbncUKWRsBxX6holHEqNfks3gIUeLPelbuO7lP16j
-qRE7i2WH0bOD8oSUtAvuPE4A2PmoY++jvwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/goettingen1 b/hosts/goettingen1
deleted file mode 100644
index 733d0d8..0000000
--- a/hosts/goettingen1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = vpn1.cccgoe.de
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAqQXK6Uk1ywBmEcaTz+ncrZNRnX9Lg1QlmTqKHl6ZqW2Bro/CvmES
-YfeRWbBVeN5w5DwMZMP7PaQvd+LOgAKiubpsn3O2XssnjuLz51p+JQ8KO127i19L
-PDokpdM1AvEdHo96lDKqpSE5MVFQZeiajg6AtPtI5IR2rjsO23U9dmAEuVzCn7r9
-34+5fFyrRK+NvAbb0qVA5yUnRwEKbeYA9VAGfmm99LriL6KDyApjEqNWJt0YNOzP
-CfSoH9tDQDIH8S8CMgVkyPtqEptQGaWBjVGiO1oKB3B7SF2MjHV6Idja80zDVEeZ
-ah0MbeQWps9x/mkyWrcIPnC+2MPimQF5awIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/hamburg01 b/hosts/hamburg01
new file mode 100644
index 0000000..9ab424c
--- /dev/null
+++ b/hosts/hamburg01
@@ -0,0 +1,11 @@
+Address = gw01.hamburg.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAxVFG8vqjOM+2M2hQiY1MFJi8Tj0sKSEWrZ/a09Hf5lQUwIDl3ZVj
+2uA1/1zjQPlN5GR5X/N/P1pErcQkBUQvduvyiWATH5aoi2WlNlNZlMiXs1zni0fF
+j0WDQ+RS0Q/8EzdW1jUyXQtidS7Hq3B+w66OZ/3gK5TuDbUdmzcdG8rr96mhgwGN
+7Wa5kqk4Ye96V67hUgrA+JZEGzddwomb+R6lppGFVG18i/JCco2rqMnKw9a53exa
+YG9zkT8DguwxXxpjslBLSYAN4AkQXQYYUU7N/nBxEK1kQGYcibTq85iFdxGgz8de
+S8hsqtRiASZqzCjZAs0ShDlb2KhBWuvevQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/hamburg03 b/hosts/hamburg03
deleted file mode 100644
index 854bc9d..0000000
--- a/hosts/hamburg03
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = 03.icvpn.hamburg.freifunk.net
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEApitk4y7bZ8yI5U7pY87C8OdHMiYMQbMfd8KmttVhCFHaXgpbp6L5
-hWDT0+NhNrmSrCTYKilUKf452y192B5FM4HpL9ow3pDalybflLWZ5fDWt1AK8Wll
-RpkGjPJLQFp+ZbJ05WLNtw5/OEsgYHF00bv6D6yhQ5wYrBVDzFvUF9a2wysFRfwa
-//rGXoPkgOtZcFwHt8rG88xMRJbVhW9bOxTPAJiQ61z7t3t22DsNPNcBwlRKOaW6
-p0DPSGuit8fZrP6bPk4d3U4CthUofM7cbWtVAYltYDnvgnkwEUf2yTuOq+PFB4jC
-xuSXtH3TdFjSVUBTSi4UjVZ84xfluFOZnQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/hamburg05 b/hosts/hamburg05
new file mode 100644
index 0000000..d275280
--- /dev/null
+++ b/hosts/hamburg05
@@ -0,0 +1,11 @@
+Address = gw05.hamburg.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAviyczF+Agoa8GZKHNfc0PuiphDpwArZ58HKHPUN8Kg9WGb0RG77G
+mzqSTbr7qNusmrXByETvi4ftLPVO9bfvTkAXatPZwhQoo0mAUyyJJhkMaAjH5HRx
+UoJ9y1ulu9kn1Q7PBPUV3/HTpRknTBptoU/0XO+3t3pYI6ZhvxyoWhCGCw9TEQ+a
+HHDFzKs45abKPZKPVOMoDqoVURe/atgwzy865AkKrCaiJLSGC3tjVQPUZbLJSl6L
+bPd4j/lCn5KNjFlZsepme/1TMtotRaA2ICd6jmrVR5n2Jcf4zhZndDJYiUR6EPde
+N0sEf70x7Dv4uHMWrczghU07DJiRL5ewcwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/muenster1 b/hosts/muenster1
deleted file mode 100644
index f827c19..0000000
--- a/hosts/muenster1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = 78.46.190.61 
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA04VN8hn5Bm4jEFLEexRP6XOq28OWnH/9k6n/0NMgFXPDRPabU+LF
-70mgOYJ4iLcux8MPJg2snWbpN9XAGBPIlH4B0D+sIGdIZstsFd9Qi7zeAIPie4n9
-e/qTQFC7xOfDbQL+Rhz7Xd5T3tTXn3O0WjiMb5fQC+hqOJC+7aQY0S+8Eav/6l/v
-EdmxSFoJOFs2NHz1GhqVy1S0LeZ5P6VE4s/Lg6oTi4aY1pKpAEzYGdPdVlIfdW2g
-OeBYayzhLwiEUuM1YAEJPbRgoaT8SFDAzD0smwcb3c3O985wdDWklCeYOoM2iNqd
-tGGuWEuSOCp89ltLRswD6zQZteAA9vMBvQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/paderborn01 b/hosts/paderborn01
deleted file mode 100644
index eee33ed..0000000
--- a/hosts/paderborn01
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = icvpn01.paderborn.freifunk.net
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA4cvTv6la/nx3rlmViAXR4xsFsxoqhB9NkfDWXkG/Nl+oZeSf2wOp
-U1nTcKKiykkqNcnTcyQMiztAtCPd+bymrWN0M5p2JMc9EueZZOtb4+OZlrIrI77W
-+8BSYoH6tX5DnZXEy3DfC2hqKZmHi/7mOwBz4wNYA0dLcUbXolrsSJMlORPYh20J
-YIn2ulwWa8CPwmg7Xd2CsuCc6hjcVGP/4y1hz0I5gOaZaRw3xMPqkRANr4/wdjqP
-ua4ZITJ358XZ3yDVEKljpn7CoEpcJo5e5PUoFdzkRF+V9JOQuQ1hA2Lunhr5hKw4
-Ykdlr+Tw/R1LKRnT2FCpEdzcT4+64tHNYQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/paderborn02 b/hosts/paderborn02
deleted file mode 100644
index 806ac52..0000000
--- a/hosts/paderborn02
+++ /dev/null
@@ -1,12 +0,0 @@
-Address = icvpn02.paderborn.freifunk.net
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAvZ5t6KIpOOJ0ZUW570Bgc+LpiN4cqeaTuEPXIbKsL+XA02igUb5M
-JfQIgy0xRpNX20ACvxq/omL9sJRs5HRvbnn3nSEIIE0fj4t0kw1Wx79Os028nlDD
-nz+Q3Tr1AvOriOTTuhVR1fI7ooHgkI61oQZTlzDAd77ALzHhJyGTcNUWifBYB4pv
-5GAaHHWraNTXj1BrM8GHdby/RjsHfnYk38MGYE0N8KKi8UENkAuIFWLP8Bj8PPMA
-ebiLYLDpPquRi+cYP1ahH8zrLgx+dXIrDO4h4cSJiewAe1dQh415ma37kV7RMAVT
-RO9NTALPJ/wstNYZdjlTt82N5MTrzgzN4wIDAQAB
------END RSA PUBLIC KEY-----
-
diff --git a/hosts/rheinland0 b/hosts/rheinland0
new file mode 100644
index 0000000..cc159ea
--- /dev/null
+++ b/hosts/rheinland0
@@ -0,0 +1,8 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA0TDDa3uBpJq8myoeDKV4yky6fZOdU6H4UT4Ex/pdMvkv8zxfgNuk
+vAcjrKfas9y+TFahj3E/dyKJto0M26Sv8cUYI3E5plXkZ/MJFSIA4WIe0Xs5uaaI
+1D68B3QuYvvxHE9oWMLnfpxD925t69gGRrMxAZ4Uj0U89pewwh9Qxgd53bj4YTTO
+aU8qWswIsK4WKEUT2Kz/yYt743eYKJnQBoJgPpO+cdOyIWfdP4BjWJe+OZimsK0D
+qel96RXJsjty0F30Fz5IgbIFbsJ/S6DUiGtcanIhkGbCSq/ldcuU4XodBXmPbYpA
+5l9I2/KcOJmBJLSDpTjf11UYVYnFrBozJwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/rheinland1 b/hosts/rheinland1
new file mode 100644
index 0000000..eb81bf8
--- /dev/null
+++ b/hosts/rheinland1
@@ -0,0 +1,8 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAwK1wirB20JHRPeBrXzJkgfT48Bssr7EPTJ3A6qLl2lDB9xJP9aG4
+0VlYy4LDEgl5QAILcLVvx2TiyDLCRhF5Fqeeisf3bIDRuvFJFZEbyEkpVQh/R08y
+A1K20JNrOrsc2Lz3IMwORXrVylYwZNK4xySvByF3gA1Z64mViQMlXc/symn8eC8Z
+Z0rCJPWMSKBWkGa3h3I8fcCv9Mdb+otQD/0BaGtNIrSqZ8/PeovuMmN95gUaXqUa
+DqSgrwy02o1TwdVWxWb89XxvjNLRIHwM2T4pa6rncYeXMwx2mtVleE0BC/UM/kes
+cpp6eeIwxTaHVji7maKLvBj1PaNmfS56lwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/rheinland2 b/hosts/rheinland2
new file mode 100644
index 0000000..57ebb0b
--- /dev/null
+++ b/hosts/rheinland2
@@ -0,0 +1,9 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAuEw4ZlMsaSJVlNvgAdX42Sfrg9D+Kqm0UMNl1q0a6gTi2HpTvTbK
+eIYQcIcZG2JteGY/lg3oc+MrreHz17SXw4nxT7YABNH8qvPrUYxpKWFv/DoviFvW
+sNA3glksMHoJlWsO8x+90zDWTGJa03vfWtOLXr+srg8otlbcXqCWFHe9FCMxpZso
+ffc2mejRLXw3irFx5udovVd3HJQn/pS37P/l1inCxTnjZWi5ywuMv61a3gKKaETk
+jOfznx36Dmpdi5RABl3Yy56Vgcv1xGYvZVEwC8VG6mMRBIg8TwhCUW3etHJz6W3L
+NHBDvfM4ZwNpItA+TdPUZiYHD5lE4w66lQIDAQAB
+-----END RSA PUBLIC KEY-----
+
diff --git a/hosts/rheinufer1 b/hosts/rheinufer1
deleted file mode 100644
index 223b531..0000000
--- a/hosts/rheinufer1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = rheinufer1.freifunk-rheinland.net
-Port = 656
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA5MIt2T0V8Non2Tpv9MmA8I6ekEaKl/sKZIz2LMzYe7n1wOh6ncHu
-INd5PklfgEFEPwRYxvrVs/kFWwFZJJqSr5i8eDfUMH0qFkJIrync9y9EhhTdiwdw
-+dQZooNYByIxxEAZDiev1ptunCdC1uIe5VIqHBDFI6tieYKtSd+5eTBIk0kehBqy
-Pn9+8gTFqqrqkhPMBgZugtX09MItL98fTTque4snF8GGsAI9AcQ+Cx2hSd1HCVM/
-22RVSz8nO2aIxl+AqiBpWAI2JnB6uzq/OyvV6GwMAetXNyzenE4OCnZmqymSGrnR
-wVFVCrIUGqLFLxerHnzosrzQ+JI5YjzTWwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/scripts/post-merge b/scripts/post-merge
index f45b79f..dc97dd3 100755
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -3,7 +3,7 @@
 # post-merge hook for Debian systems
 #
 # 1. copy to .git/hooks
-# 2. to test run ".git/hooks/post-merge"
+# 2. to test run "git pull -q"
 # 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/"
 #