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/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/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/"
 #