diff --git a/hosts/Treuenbrietzen b/hosts/Treuenbrietzen
index 512c04f..3bc18a0 100644
--- a/hosts/Treuenbrietzen
+++ b/hosts/Treuenbrietzen
@@ -1,4 +1,4 @@
-Address = shonyt.mine.nu
+#Address = shonyt.mine.nu
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBANbR3LhhWFNt9ak//ZTReEuNQHjibgTAM+cNTDwLevudrP3y9htxTzgF
 UZDHnkbDqwrYNjnuaMLIik7ljj5aKQd+fXmv3S+sFvvaPnm+e7Fpt+r/ReTnS6su
diff --git a/hosts/aurich1 b/hosts/aurich1
deleted file mode 100644
index c0b000a..0000000
--- a/hosts/aurich1
+++ /dev/null
@@ -1,6 +0,0 @@
-Address = vpn.freifunk-aurich.de
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAMTmDsazE1oEcjoMdiVtRtRyY1YX13DtK7O3sYdNMUjQA1Zn+OgDPRxm
-okwOAvT6ZqWr9xLmYWose3Vh7x4wuuNRuGaKgbB0bqWGWBlYeaqTTKGT9V/eJalj
-n3of5UZQkTDpYHd4RWNRbYKT69sLfR4/8gmp4EUbAPD4JRBrUGPvAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/badzwischenhahn1 b/hosts/badzwischenhahn1
index 07cb608..b5ae63c 100644
--- a/hosts/badzwischenhahn1
+++ b/hosts/badzwischenhahn1
@@ -1,5 +1,5 @@
-Address = ffbz.ath.cx
-Port = 655
+#Address = ffbz.ath.cx
+#Port = 655
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBAMlCF8Yj3adfH6Mssc7J59CMIzO4ZTa4meHXDaGWHXzGIMnUWRUlLIfp
 7sa/uJ4U9iQU3ZEwv1cPWweDvWrG1HNL+oJEVv7xQWcBXaYnm0le305qom0E0U5U
diff --git a/hosts/berlin2 b/hosts/berlin2
new file mode 100644
index 0000000..8d1f927
--- /dev/null
+++ b/hosts/berlin2
@@ -0,0 +1,10 @@
+address = icvpn02.berlin.freifunk.net
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1+W5ZQo4iDlSZP+XEaEl89g4K8md9ob9i6SDg6YRGCZQG2dUjtZn
+YOxi5fHhk0WUcHtUwTBPj6qQ7AlsLF3MOBbK7wI+rUQyMXd+CfEYC2xAhXFIjgfx
+Takrqe55OppLyKcviAvlETYBdmOa67OCJTH8k3HfZ8RGAubPcxUyyyfvrNT6UTjC
+CfSdli8aLHlQ/PrjBeV+Z8o4GpnI6FKDfOMVdvqFGta1tP4YVUmb+EGVlDeLRHZ9
+oWXFlwfbaYIvrgu/I6TuDaOABO11ZdjqObPnAOtHY+PMzdfXe2Bwp+6qzeUYKs2q
+EIR/2m2ioMC/IXF2lBQH37JqN9V1s6PmiwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/braunschweig1 b/hosts/braunschweig1
new file mode 100644
index 0000000..7fbe162
--- /dev/null
+++ b/hosts/braunschweig1
@@ -0,0 +1,10 @@
+Address = gw1.freifunk-bs.de
+Port = 655
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1SlHQTdW8wnYWpSRwZWx5BHOHm+0WzZNN96edmUqAi5hrVQwVCeI
+ycmGtk4iOqyMPPynhVf/aM3huXNXI9ObCKau+QUsmEv7c30RId9J5WxvQ7qCejf/
+v/kGJF9B1LPtZ5v0bB1euxypty5g5SBdfQ2KhLHyRUiLqOTBenhoJmI/KNjGxC1P
+A3IzGF2/3gtxbq6eRpdKRl8ZoEXuaLKzkBEM8mwh9QM9ybOXOd1nM3K4NCyB2Uej
+Vuikr2sagN+GVZhZOV2HfCb7xVJUdEQCKRIDxzmUu4/NtZEmkGFqfce1EeFkvJmu
+/XeUr8QRaIIPwirMNy47UCtD4Q2NQBjHVwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/braunschweig2 b/hosts/braunschweig2
new file mode 100644
index 0000000..7ff99c5
--- /dev/null
+++ b/hosts/braunschweig2
@@ -0,0 +1,10 @@
+Address = gw2.freifunk-bs.de
+Port = 655
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA3vOFU3pGxVUVHAEDeD4suiW8tUuwekWle8Tu9nx13BEepdZFof7m
+sgqhJvbfqRE6JZDYCCzZPRT03xBNv88odzOqhgHSSg4qEB5/hGtdJGHBRZdGJd0x
+XGYv/eHAH6nh2Dx7jJmYinRDC2IVrZkVtKEmQLSLgYAKhNw8BKRHqaxAjnYl2Ar+
+RITsxp1qcRxt2yt5AShN5APPzp2SSzV7HB4Xjq/D55WduwejPCen4SZnjrhgLdQM
+kSJV31Mc3zlhmN5KSgkoCGbkky61XXehl4fXCEJ4maA0mmLU0AMHq1jRek0gI5n8
+VBefp/+MVxJ2cSE9EGuqRqB9b3DJOs3hTQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/bremen1 b/hosts/bremen1
new file mode 100644
index 0000000..25b6df6
--- /dev/null
+++ b/hosts/bremen1
@@ -0,0 +1,12 @@
+Address = vpn01.bremen.freifunk.net
+Port = 656
+
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy2FfayKB0nuggl/B9Lff
+lLAWf92KPDtmJt6un1nRylX99n1yTatnnzW9r4dv7oDKJVEGxOe9d17CIg0l/lQQ
+UDC0sBJmB+JLQE8INHASQPcRbQVvlRrq+jVSUbpezA8H4W/FDc0kyERJG4zHAW4b
+Om0c8ndFZBU2eMXTyaeFZ5gi6AETZ+GAOt3BGP3lhzVMIotnSf5Mm1q5EOejjlND
+dsz3Fsn3ScWgVeUCjwWK1xs/jg5+pa90he/eqO+DmihxDA0006YBnQcA0kiprjK2
+k6Jo8J1KWD8G3m0XvWOu9z15WAKvkNSw96h28eGefsgQP+XEpEE9aWGcbuj88ycK
+dwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/hosts/bremen2 b/hosts/bremen2
index 138504c..e17cefd 100644
--- a/hosts/bremen2
+++ b/hosts/bremen2
@@ -2,10 +2,10 @@ Address = vpn02.bremen.freifunk.net
 Port = 656
 
 -----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA3hpaoTvL0tI0Rnw9jpYGv+EfPjYzWuYf3xWy5DHBRN+8ualTk6tx
-xzM+3Kjwlb9QtEkSVbGh6RRX7n0S6zwWc6TXYW9hnOTxzWdb+a7yAb80iXNl/8yC
-MOOPphTKl15go7juW46/k4mEPxI/VStPmheAeMbU4YZDsspLta1QWr1Oo2pCON2B
-pDCBE/PlZOnJ6L3JX4Wxt9LQsUsB8nWNmVFK0LC6NoN+fASz/qrnTwi7kb0PWIrS
-8vEoS4J8NKjB5yT8GZyhZma5B48u7ABVNQoSA+9f27PZIq9a7h/mHuQUpaNGvbgP
-I8pYwBqEmH5HUJGApprS9hpevdm3AUE0KQIDAQAB
+MIIBCgKCAQEA5Wtnae3Qx2Dxf4PPPQuC+E0nOanMw4sbOlXjNBTNrNKAMVCH2MdZ
++cWZXIqyJ0aVYdjbH26tL/gjY/Uts9o52F6NpVCGrrgiua+qgLS0ZrlUllIjdqOW
+yStc+1OnouhTE24KR81SMOsfmtyIt0IboCfB7TcJGbtjpQopzSks6Yv5fY/ybmm4
+3i9DSqYgJstBqMCZ2KNAajjMzCaQqljMR5BAYZsILo62MUa//oTZ4+M6XcODvctP
+vPWfi5DWq9eFx2RiG03ePk2PWDFMazx3QXo5m/2d9iYVAqwJuwecayheGBmmAw3s
+mBbTnmJ24P5o3JrkyefsQCmLpyajfab6zwIDAQAB
 -----END RSA PUBLIC KEY-----
diff --git a/hosts/castrop1 b/hosts/castrop1
index 79c61a8..b2e0df1 100644
--- a/hosts/castrop1
+++ b/hosts/castrop1
@@ -1,4 +1,4 @@
-address = ffcas.no-ip.info
+#Address = ffcas.no-ip.info
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAr1d6XRKMLgt853J8qxguOb017hjVSB4LNWKiLEXk1K5B4sPBP3Sj
 6/3PjI38dbZsmWqOV6azMmqTeBjBKt1Ii02sfrIB0hc3JuwcCeLLrPtmxUWCIXon
diff --git a/hosts/darmstadt1 b/hosts/darmstadt1
new file mode 100644
index 0000000..a0d26c8
--- /dev/null
+++ b/hosts/darmstadt1
@@ -0,0 +1,15 @@
+Address = gw01.icvpn.darmstadt.freifunk.net
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAsFBR3wzdRoFXDy38HQtlYDKHvsbY99fUkPZXxg5v3dBGIfWDWMBR
+44C7OyLWKmF7cwZwOe+ITblJ05La43oEzLFLjRC9yC77nH+gHxC3yrqSJGENey3v
+XSThNdcYGPzbrEVf55Nbo0GFbtvBJtXOdPc9q1HyobsDKVZ49T+sBttQBNgT75LL
+o3/a3Par8QO4FfSiL2YkdjYIHYXaN3Knlssxfxso9DvJixlDxruHVuWeW5NKEzJ6
+qIjfy/sw9GW4YVygbxqxEsajo3SmU5mzOVYcUuEGMRnlNAvrbtpDf+5gXfyoW34J
+2IuHw2LO2r+4M9Ek7llmS8HtHrNe44w18i3shePyINa0xHUFwv5qPrzWn9XXWbH+
+baxkP6U97afRsAhMOQ2EO8a5ZJG7qYDZom884ndD13BFkQjHh0yfKNQnyo4R+Ke8
++PDPkig7Dg5mWMeodPiDJu6o6FE2fZLClG94dVvjP5IQjlZYIFmkjwnTgPNR96vE
+/CERPrvIUPhbCIkT0JY4Dyfe56o6iNKHWJcxL4vhy8zwqPf3P1cwprtMRvp4eDPh
+9NNq+Mjb7Nu6LWTvImb94L3wQ4xM6ngktE+DFUMvnuVTmJP1Cf1zkgLf0T6QNpA5
+wnMzgZU+q5IUkQA4660iM+8IyCaX5DKWpuRM/YRBryNApsuYJ+FsZNECAwEAAQ==
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/darmstadt2 b/hosts/darmstadt2
new file mode 100644
index 0000000..80e3f39
--- /dev/null
+++ b/hosts/darmstadt2
@@ -0,0 +1,10 @@
+Address = gw02.icvpn.darmstadt.freifunk.net
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAuohUruR8enzVN1IswdzMuf8f3rY2HOK/yByItBcMHM9b4HMe6Jt6
+ojJLqbfS2wtDs/a42XuZjzf0Hg9VJqehDhcA7u5fKTYyJMbiFvkodCWeTzSIs+sE
+vj2LIyqIV94sjrG7Pj0Np5hwy/kyoaj41LMoXcyKe73K5krurgxUtxxycWPfrvuB
+RW9lc+6XTrDv3I6XdNTe0Nj9XRkdoUxzJXQfLHLUx/ynymD7w1325cf5JAVTW8YK
+gZvUSZ+irwenMIc+qTv00z8THPQaB0wMoOfgEe8cA85sBxkAj8cOMzoiuUxjgk7/
+WSejxCFFpXe6uXLtdWKNAPWoYUq3EXNqrwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/diepholz1 b/hosts/diepholz1
new file mode 100644
index 0000000..10547c2
--- /dev/null
+++ b/hosts/diepholz1
@@ -0,0 +1,10 @@
+Address = gw1.freifunk-dh.de
+Port = 655
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA3SOeCXMYhCyoBXd4LhJDEdq8afDcdT2+kX+8Cnv5HHMWfKv0PodZ
+1zwPl04D3e7MJ+F73YXOIV6zAdEpwXMW6h15qg3r5vL+ZPKY/ywYnb3c1CIOe2C8
+2rJoo9ynjJJt3rbrSc2qOkKFcEfSZWPn2cs9IiaX/tgZaPwpc/KDjPQ5kQ9AwVJk
+2jMhuBHQClPUw/szHwkultrkRehQ7+H/lq7VMXdxfBHBh6Vtk6KX6N8S7NXYcKbG
+Gk52yzLnlmGLxqJbPBBg68o54EEPsS9HUe4oKRkhYoHduQu3OTL4oFZTTXqVmaxB
+JSXyXDFbJPMPNoSsC2F2D9bfPswIfH/efQIDAQAB
+-----END RSA PUBLIC KEY-----
\ No newline at end of file
diff --git a/hosts/dreilaendereck2 b/hosts/dreilaendereck2
new file mode 100644
index 0000000..35848ab
--- /dev/null
+++ b/hosts/dreilaendereck2
@@ -0,0 +1,10 @@
+Address = gw2.freifunk-3laendereck.de
+Port = 656
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA6KdvIDFhgFH7VVCMPZtn5RQd6dXtGLz/6vMWuak2rSHBzc8YFRho
+hztyRrq1poGJDa6w7hTDzx1rwoF289qGt9bJVfwmsiEbKWKKD3yJkbiOGK2qVTEo
+lmWP8ymNr83miYG+ZXS5ed6OL/bwTfMDL60HpKKoK8pbewpWOTcTcGfcsBts1bn9
+8iv0att4SBDrzaT+DHaz+DG0apTmVCP4LBZ5NK8l/GtRSH+Qbk8jQ4E+dZW0tJD1
+BOvo2TJ41hTp05xmoXk6r1wUY2VbbuMm4303X2cTEh1F91Jwx7ymjjZjXxVYF5C1
+sg9/UJN2VQUzo//InoY0KIf9jam5nkPxhQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/dreilaendereck3 b/hosts/dreilaendereck3
new file mode 100644
index 0000000..bf28c61
--- /dev/null
+++ b/hosts/dreilaendereck3
@@ -0,0 +1,11 @@
+Address = gw3.freifunk-3laendereck.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAriAC3ChanNKtXgp/Eu0EcTJTeAM8yp1D35SOM89hVgygYmy4woC0
+CEx6SbVFnwzL4Rar4+c4XXCDLq74AsHjTe7ulzvSDJ/acSoOVsXZ0Wnb5QUFYDlL
+ue/2dp9TNHNRl/27OjBL+5fQM4LBvdImBJFKxuYtJc5ApB12LAIAx2y5FS0mp2rT
+k2+HDZgaxanlUf6ecaFp8H7A5LiITig8nHUa9/0J5U5Q4ZzYoSnjQKiOKvaOWKX/
+RydUCrZyiyVl12tlEc/FcT//zj7XrNE8oHC9LaUWb6masCCzv0WR5Ck5XX3yC+/m
+gsvjMK7c1I/tFjUQE07MO68qXCX2zzV14QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/ehingen1 b/hosts/ehingen1
new file mode 100644
index 0000000..3c7d3ae
--- /dev/null
+++ b/hosts/ehingen1
@@ -0,0 +1,11 @@
+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/erfurt1 b/hosts/erfurt1
new file mode 100644
index 0000000..9162f1a
--- /dev/null
+++ b/hosts/erfurt1
@@ -0,0 +1,11 @@
+Address = sj.weimarnetz.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAyjO839sG3az3LDGyuc9V1zB/0WMFXwnc73yxNyk9QsL5isSab2D0
+ajdeF2IxqlGaOE1Go7mEgejlAL6Wb06jnll3j/QxDBrE2n1frmENLZjENZFdqWQo
+EmL8f4deOiPZZVxX4KIUlNETbYUPMonW+tffFmaBiRQm6FhmSlcYXxSuttSFmxbF
+If4apkQVeSyO6nNL2Vdzrd2XDnJvHq/7c7KMBHkczyG9LR9RBVAog8wpfFrIRqsV
+Kmz9g6nHiEh5UcARsZqWDT2UnV8vwHJbxHwFLYg2Dnd+Xo8GOQgpw6jQlihjBfhn
+8+D+K0hoPGkwH6VxTYi3TB2X/nGTnxA0vQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/flensburg2 b/hosts/flensburg2
old mode 100755
new mode 100644
diff --git a/hosts/gadow b/hosts/gadow
new file mode 100644
index 0000000..c9b26a8
--- /dev/null
+++ b/hosts/gadow
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000..733d0d8
--- /dev/null
+++ b/hosts/goettingen1
@@ -0,0 +1,10 @@
+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/gronau1 b/hosts/gronau1
deleted file mode 100644
index 6e4d1f9..0000000
--- a/hosts/gronau1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address=icvpn1.freifunk.liztv.net
-Port=6655
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAxQUKeL0yOM7tMVRZCuTLbguK3A/KdVA2OdNXs+30n8iXuUhz//jB
-jM/wWPXDmKrJSd0Vgb3REEQdE+DgbYI92gstDmks5ekrczgQFTHacVflE3XfJ4MT
-CmGyBBxFV5KKGW4FNWGJuxIfArwCtATQ+3UBpLxT2gXFTxuqh8G7zYIT9WLxU5HV
-sRMUPc6yBvUBm3gp+3c3Wqtau2YNFrkZ8KvxqFqbTjnloe8TKd06icwnGgdlWkaW
-pyQivCotS+yIFKkAZFGbmso6EW2MGp3zlEtPE+8eWFx5OcnGz1MFmScgMEANHjbF
-AMRCA6ewHbq7Qc6F9gQrixhpfU09LLtoVQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/gronau2 b/hosts/gronau2
deleted file mode 100644
index 5cc0914..0000000
--- a/hosts/gronau2
+++ /dev/null
@@ -1,16 +0,0 @@
-Address = icvpn2.freifunk.liztv.net
-Port = 54419                  
------BEGIN RSA PUBLIC KEY-----                                  
-MIICCgKCAgEArU741UxzOdAmc75R5HT6XqhNVGw2WiuVGfhIlOVL35GBEwiCGf3T
-eyKg9/hVOa4LmxEeFupXWUcopf0L62wuYInNTooIxfsQrh8VEtaIz2NtHmAaJmuq
-luyZoup19+5LGlUI7rNlv8yyn909MRXIjGEmnwDH7w+0XPaj2XOSwHGy6Vf8znil
-WFQK4lfhW6SVg2nwFEWd9txnLVtRFsts+7B0eJZqEqjHq0DHU8cvoBdbipxK2Qgs
-5PMb1GgOy1kG2To9csVvERfCRlZQelnjcHdfl35KsjBgq2qpRGl/7W3fuBXUeOIj
-Q4cpJCoyRNXrkYhG62u7xqumuGzDoMPub0i02cYzHxWcxj3XUzHwllRTYJNR4FHz
-4DzhB+dhWOTXbEX0pF8vGclLalmAbjpy0PZ80k67B/x7a3wIm13uwrNJWZuAxVBk
-CGh+o+GPmJDRLJgltSeXaD0cmcQAdfgqlNu/ziwxP8izmMxBgdabEpxDWC5qkrhY
-94o7mEFpl0bILgamPtHgS3AL8ekO9qZs32UI1JiHl3VZAA4MFWCK1lwD3c8ULtU2
-z2DRRi8U5utZNi8iXsd7nKQd4aB5s8lIU3zkYBc57sumoWunpsVPNS1f8T9SK10a
-JUGg/jz3UP+BH1QF0AGkqFGGDSejC/GODtQD6c0jFwWKI6y285dygt8CAwEAAQ==
------END RSA PUBLIC KEY-----
-
diff --git a/hosts/grossdraxdorf b/hosts/grossdraxdorf
deleted file mode 100644
index 01595c6..0000000
--- a/hosts/grossdraxdorf
+++ /dev/null
@@ -1,7 +0,0 @@
-Address = ffgdd.ath.cx
-Port = 655
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKhb22phgEM0fsbvIiqKRp4RgPd3N7mPAFtF0R55wyrw8QUyRJ/M0TKE
-jJQKw8UVlmGNBcvjdLJQLowDhNn/3cob000ADVHaFrOlniwnlr4xw8FvARvdll8S
-Q2l/uJXccBT2f5BwC9JxUPStdDWpb9r5YTAxVh/cA73yI1xNrurbAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/gueterslohbgp1 b/hosts/gueterslohbgp1
new file mode 100644
index 0000000..4e20e21
--- /dev/null
+++ b/hosts/gueterslohbgp1
@@ -0,0 +1,10 @@
+Address = bgp1.guetersloh.freifunk.net 
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA9lK5No/IuY3o2NaIklnwYD/lHtHG4Qs6qjBGGrOmVJ1N2UsQRwVr
+kbO5pi7sn6dX2xojn4u6WYDIXGdOEihlxdJ7SIgcfjlBSSkSlc73E4MAgG46tOSp
+SdAKhllN2J614Mng2TWQ8SmQ0xMSR80FiJkwMnZ8pb4nUAr5kMiplzxZAxLrUyJG
+0exDuKTPG6fKKIDKBXgO7gbUMbhGRpduo7BSS2VJ9SxtuVgI7Cs/d0O06f9L9Iq9
+krxzb42OHJk9pEQY8EB8jFQFiEdL7ShjXnJ+H5SeUyFX9bJZKyOYzAawwMWmkDK5
+Xm+6ZUW4XoMFWxJ79hLHu0oWxTcWWWGX8QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/gueterslohbgp2 b/hosts/gueterslohbgp2
new file mode 100644
index 0000000..a508444
--- /dev/null
+++ b/hosts/gueterslohbgp2
@@ -0,0 +1,10 @@
+Address = bgp2.guetersloh.freifunk.net 
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAwNqFwx5UvkekzqCArb2BBFBqtdRbOsY5WlL58qXPVm6buVqZhy0R
+ZZ497YrX82L3K97sFZ/1jFa/YsY9n6E912Zcca5GxY7ln/wrkO8mSfvCq1KCUpv9
+/00cQxTf+AVlHvryWDupxPasO29wb6b5ftd3HXR1lG/eg3YXmXMAFnWr7wYnrFwW
+1YP9YW1cJRZw9AjQ7Y1X2ETa4JkcjCjY7R7hVoJFoVqjf5JLBpqGy/swETrQB0Ln
+ZpSRSrmfMhf1dIIYnYLoqH9og6ypl6vAqYAOwN9KIFTODK7uXW9ARVyor9I9R4cC
+cMtg3bB/QyS+GJDyvYCGJn/ZL6TrSOw7WwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/halle2 b/hosts/halle2
index c3d6de6..e15833c 100644
--- a/hosts/halle2
+++ b/hosts/halle2
@@ -1,4 +1,4 @@
-Address = ffvpn2.3dfxatwork.de
+#Address = ffvpn2.3dfxatwork.de
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEA0F40mEg2vW9emNFi/Sr10rN4d/+O6VGLKjHGfMtUXxM9xILBlbDt
 Tid/mB5eOJu6CjXxLAlxrx0Ppm49jooD0BJz/Ajk7Xr2FX1pDxCAxwBBGj2iruy4
diff --git a/hosts/hamburg01 b/hosts/hamburg01
deleted file mode 100644
index 9ab424c..0000000
--- a/hosts/hamburg01
+++ /dev/null
@@ -1,11 +0,0 @@
-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/hamburg02 b/hosts/hamburg02
new file mode 100644
index 0000000..b52d8c1
--- /dev/null
+++ b/hosts/hamburg02
@@ -0,0 +1,11 @@
+Address = 02.icvpn.hamburg.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEApyg+KLP9XfIwOIgBHjbGgt0l5ve+/O1Mec3ed/d0q6Bh+oTkJxOn
+ejtqYPXjBYkm50eCR0ib3xuc2HIB88v9BgW+wMjRtiUW0mPAWzpdbUa2sZPq98kG
+xUytXz1+3xFBnVhMokAnBHaWO2LnV5Xy7XDpETd6ffrqA/eojm8IdDjPYraHBof1
+d5GNcrS2twaLh1ENMikpyAJqH6lr5vALXCDS/TPffv5GuOX53FLf3ZIzFM39fREo
+1iBLeAHdVnYSN8ilsvH5No5wFbOvywctbRTqVQ5tM7ILTstsh044Q6OVfgYiSz6L
+0D9xpd6OiWZZcsecPCN8yHl5fs7uoRV4uwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/hamburg03 b/hosts/hamburg03
new file mode 100644
index 0000000..854bc9d
--- /dev/null
+++ b/hosts/hamburg03
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index d275280..0000000
--- a/hosts/hamburg05
+++ /dev/null
@@ -1,11 +0,0 @@
-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/hannover1 b/hosts/hannover1
index df36466..95a691b 100644
--- a/hosts/hannover1
+++ b/hosts/hannover1
@@ -1,4 +1,4 @@
-Address = vpn.hannover.freifunk.net
+#Address = vpn.hannover.freifunk.net
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBAJsf2VLpTQlglzwBWe2B9RIgTEl4Y2a22Xt0DMPRw2vRc4aLcYh9G9TC
 IvlXl87TKILdkZ8jlK9cMmwupAmtoxlRUCDkode1dqZ/Knf+iIOCP3jBPDggKKcR
diff --git a/hosts/karlsruhe1 b/hosts/karlsruhe1
new file mode 100644
index 0000000..b957ae3
--- /dev/null
+++ b/hosts/karlsruhe1
@@ -0,0 +1,15 @@
+Address = albufer0.ffka.net
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAnUWMpHTF+lbmBn3hs1awifxJdAKgAabrCAfTkIdq7uZ/UJj1mHx6
+/PUuofoh6yXwrOZmt1838X5VswFjuaEZq3y7SHhabC7Ry1p9c6PU7A1ZSewzZpLZ
+cx45iFJUs0/UpZzEQysBlvC3hU5BEIhduJ/LQF06jZ6x8x1xmlGwloKf39cbbtL2
+Kcwzel24KMEzfw2HfbR6JfXxvQQj3MapNbiFaZlbyQNPEWJl4dDR9PuNG4p0yKyE
+hYc3aUXdN4y1f5xCkXNcU5SLMBDkiO7qv7OAXiW1DGFo3lxl56sS90KHcmjPSawD
+QURJOh3oubGQGLOdmBZuQx0Gx1vJDqF6faCCWo/XXGwZQ2y8KKhPeHX8jg/xqjBv
+kUZ+jcOQ6AmiZWkILGKv3IpEp89QII7BJ7b3KpvNg1P3eTpSx4kEC5ZUkaA7b4hY
+S3Mbhw5MqkH7AHALOLS+rsP2vJXON2SbxGpVIQN9j/eBA61oC6Of8IxZcM+g0r1M
+W2ep/J/YWtwo9EpHztzS1gnf6MQ+ImFAfBlphbo3VLtLwHGISV2UZfhM5QM8h6GX
++Q+7uumFuSKvRJwGA3bYIosgz8m/EWrvxpxccodfjep2vbUBxDmvCvAwWVomzxQs
+Os3CP0qdpymvPjgtwyxrMaCD8kJi3vfpD9NzCQB9YpL+PNBnguaQGS0CAwEAAQ==
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/karlsruhe2 b/hosts/karlsruhe2
new file mode 100644
index 0000000..59500a6
--- /dev/null
+++ b/hosts/karlsruhe2
@@ -0,0 +1,15 @@
+Address = albufer1.ffka.net
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAv3w8au8y75sWMzfi1sRzOjI/f+7Gak0qqHcGAQGd+TCwF88OgGDk
+c7TUQJfUG1FcLSiEMKUSKyokFBU6qbzrnwxsK+/foEGrcde4CKaJ1/q+wxL1lRu0
+/12ZVIvr6rMHugjD7XfRbHaUoH1p6ki1+mpwRiLKgKimYxaKoTTJGzkR5Gkabu59
+J7zq6NhzDl+n4usI16Hd2rCtdvG5txDQJvnQTXS4oaidYMDbOulAK+FmDSwkPIcU
+uaGELGD1eMDKR6e/cp3DqTLG54GgmxamL1i44iGwOWfFGC+JfeNEcS/FgOzIhTrR
+a8SRnwJ7FnfqaOee0Ktht1iRmuhJQxtrgusi++WII77SC9jH1kZw2bqh60YbQVlh
+szNPfbpu/TRiqlduDJDmmJgXDG0J3eSvzLWT1D+qXG5Swk7R04VYLCh/oXHAiHol
+l/3D7423tcW51hq316if/9ncfXpKXcdQiEIjmhVt1vi7FQk+1lwmTOKXBAAXnZDb
+7zO2aY1p7YncAudL1CP3oQPazWQHW+2XmLvnOL5guBb/3LL/3CltwBUAz6zfm2Pj
+YKNiQJG5+YBZaPAIy+y4mhDbh9TIO3Zw0eNt4jinu7486iWstkjj+V8E7fWkTBZd
+t2kGBpR5xOVsd8ettZr5pDni9n/e/SJasizsqGjsQnPjWqEUj+wZKn8CAwEAAQ==
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/kiel1 b/hosts/kiel1
deleted file mode 100644
index 9d8e6d3..0000000
--- a/hosts/kiel1
+++ /dev/null
@@ -1,9 +0,0 @@
-Address = medusa.dyndns.toppoint.de
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAwTcMQ2KE8zQRNcYd9/ivnybAY0M72j2+5fbYPZk2puMPURy5hFLk
-nMiF3r7N7OuVoK3zBjlBHdjbRuarheYLFHqZo6TTjxmqZOMytgjuLiCC1DRnPKSg
-TFgbNu6TsqI8WkIe2Y+kp3btpNb7JFUPsSoZJXI2BAzx1TcVQLLwvQcFQiGBle5E
-wWNpS614VM/D5erNHovg4z0Iw//HEvoafpOuPJPrxyHl/sCnJQqikwLG1Wi7ocUY
-cRzYjje94Ygu5BZ1nz4yYYQpa49RuD0dS8JF1p2UzPeUTfExWYBpX5uy73W9RKcW
-8gSdrs1QkyXs4gta8/QMJmnXff98bl7vZwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/kiel2 b/hosts/kiel2
deleted file mode 100644
index 67a2736..0000000
--- a/hosts/kiel2
+++ /dev/null
@@ -1,9 +0,0 @@
-Address=vpn3.freifunk.in-kiel.de
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT
-3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5
-WyoInGpUD26sqPdXtcs9bAgNzkDCm7cxMtQiu4SGWyNYpfkkIb+4miUKyjnWCrqi
-nWTX2KC4MJh7AMWSrk6vX7aYmV/qmHkIXBqhPKe0Ah6rufc8+ZkSATJJxTM78qwD
-sOO78I3V6av1+QlaF9wCr5/X/eAD6XUEOJWPuiTflC27mDcihW2NE2YwCIDX8vk0
-Ccuo6OGrjJpZz+ncEjCcFICPpKrL8kYCdwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/kiel3 b/hosts/kiel3
index e7110f0..67a2736 100644
--- a/hosts/kiel3
+++ b/hosts/kiel3
@@ -1,9 +1,9 @@
-Address = freifunk.in-kiel.de
+Address=vpn3.freifunk.in-kiel.de
 -----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAmeK4Al2ivNdnbAiPyM4jxFIGAKpjowGoiHUA+eN10OViIPf3R4hH
-sGhkUuXddAoq2meE5cNix7lMMmeE3npbKR5r61a9mqjPm8sfrjdBOjYnlEFoGlN3
-Ck/XUpm6BC6Dl3yvbPRrClochjIvQUbUKMma4q7/4sMRzCgx0eykL2UgocBkTgp6
-scZrPc2a3uLAA89r7EWQTn8rVgY8mlVt0evCwsQg84OrPSYCsrDYWQh7sTQxsnTV
-c1dnr5PceG3zAHdd337XqkN0UgyAX4tTuxxTYv5Q1uqF1mGaXrKh/tIynZ5NiCfk
-Qfe1/3phtF2tgPF4fGBrBi3uRVLt51qCAQIDAQAB
+MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT
+3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5
+WyoInGpUD26sqPdXtcs9bAgNzkDCm7cxMtQiu4SGWyNYpfkkIb+4miUKyjnWCrqi
+nWTX2KC4MJh7AMWSrk6vX7aYmV/qmHkIXBqhPKe0Ah6rufc8+ZkSATJJxTM78qwD
+sOO78I3V6av1+QlaF9wCr5/X/eAD6XUEOJWPuiTflC27mDcihW2NE2YwCIDX8vk0
+Ccuo6OGrjJpZz+ncEjCcFICPpKrL8kYCdwIDAQAB
 -----END RSA PUBLIC KEY-----
diff --git a/hosts/kiel4 b/hosts/kiel4
deleted file mode 100644
index b3145b3..0000000
--- a/hosts/kiel4
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = vpn.sys.ccs-baumann.de
-Port = 656
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA5c9ilZOeCjcwV3S6z3hemdU7V8mkLYtcSt9M9g7Y7VkOPFy8sPl1
-Wn4MqdprNSXrLdhkFSxeaKAYbs9HrzPu4jS+7XD7Ezdy+7GOo2IghBngtUL4BTGf
-ZCnRNRObovtB6o2x4Rxbl0aaIEy0aOkMOsLUXH50tyeCcnJTLsHQTuNqOSG32KWO
-RQLTJeIzl39RcECarJS8NVYWdH1HiZSFRQGq+W3eS/tMXm3+CGAzZk4ZxGd+nb7N
-9bqnZAYNdQ6jfEIYICR8yglHCroGsa8tRy0Frk6b09P2LnCSvOo2lMiYMu4upAkr
-zVoyqPXEOXNrPDTaTQP9h0+MeOfqvfPFRwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/koblenz1 b/hosts/koblenz1
index fe5ab17..52e3e23 100644
--- a/hosts/koblenz1
+++ b/hosts/koblenz1
@@ -1,4 +1,4 @@
-Address=dsserver.homelinux.org
+#Address=dsserver.homelinux.org
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAsnls6tKZlZLjmOhjiMTh63GbOaEJ5L3/N4WQPNZN67YOoL0ISECv
 QeQ/p/3iRRhN4EG58CxAJ0X8uqpjqP6xLcbBSDfLbAawjFzU7OrKWiCAmHeW5ZTk
diff --git a/hosts/koeln1 b/hosts/koeln1
index 1db427b..2c6de0e 100644
--- a/hosts/koeln1
+++ b/hosts/koeln1
@@ -1,15 +1,16 @@
-Address = fastd4.kbu.freifunk.net
+Address = fastd3.kbu.freifunk.net
 Port = 656
+
 -----BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEAsxM/YeBqWIOp0Ld0wwrTLq38OjUSMfC3dsInjWa3+mfsRA1DW+RQ
-Xru73jtUF0YpyEz04NmbDYGi2YweKVg5xwBiF3XfdZ8fYhYWSJfBa60o2dWfbUlg
-1UZJHEnVbUDXWfzGIStiIlDEGjaFjt1Aem8n1R7yVYE5eMK1U3lVuPJswt+HvFE6
-ZEuj2MhstiZvg9uj3f1zXjF7sEZutLagt/JLSboARbtFe7rPhhTIUa/Kn+CEQePo
-st2FM1T58e1yNoPgUUjnn5QI5bX0g+k8e2oIYGm6YptQ7/ROG4ElTvlj8V5nfZot
-yzICsXfgoCcQ4/A4r7V4uMS3Gp/a8wOOcDoDOTQzMBBp8IEEbnwOkH5UbGIBp6WE
-1pZ0Zku0jNuvNcALWUBHn4NaYVN6hm0LIVFB26TYclXrcD8Rompn8Xlbd6qsOEpx
-n6ocnYrOwhhdv8c31fTf7urUTWgEdQUXN3jn6PRgCnDnAQy6M9+UCd0sMzf/3Nmb
-opByBr0WAAJdtfGbA+cCiho2ptO+XgVQifTJ1GC7X7CspwjV2eb46tc7AiEgUqHj
-ZopTzY7hWBxYTvR+GoCKLXJe4KFx4y53jgYbvgNiVNH9hjCnsyW7Bbh+asXNWoh8
-uq4wXfu2o6iO8rgAppy0qW9x4mJMZjZ+zjaHtUpvT8NI3jOQ3V/BbLsCAwEAAQ==
+MIICCgKCAgEAwzH7Z0W0yIDp80G8sHpaxez7GXL3Lql7DAdJkrNf6KEzZAsZ7usn
+9g6OoO5wQIWkBlEyGWGiCEIbGOHUQ7WjQwCkqO8Lfk6pJzheTjrRx7Sw/jd2aJwc
+szZG/DN3T7Mt1BoYHqT+Q+SyoAgIggoCDYQMaRMwBJkb4c8MmHDEEW7tmJFip+NQ
+5xv4BVGJBtWEkVhpVdLv6IQOB9jE1Jzpr8hlXDgNGqgKTAhK+dUtmpcwTRNyZok5
+0GZimewroF76FTy7bqiLJK2iotMw5SHbut3agaS7BTEggEkNeTzLq1p2YIf5lVr1
+ctTqkgiIALjiccnVhoWOwL9Rk+HB4O8s8qpK4cnLTHIkLWfLFLiuYkkENWMjiM68
+NVWbIkxMMujFKj3edNb/FD7vcdQ3kT5yoVwqTKP8UdboU4W+0LeLWCl3dOIF+gzz
+57i8R4tugDUKms44L97Pt7ArjF8CRrFp43lV5LRxKTw6EeqU5BgMUyRXI2qF4d4W
+EOQIMOX0v6P55zKeNKNm7iSNroqWeMA4wje0N4CsUir+GSQNFvmC3j0RypChcnmo
+WHxCvnI1BMRv5m1PyxCibeiBlXSYqV66P8+XtSTWaAnnGH5scj/d3zO9fElqPepl
+lQi16kmvex7I8S66jGh+MExIbEvvxJNyPaBQ4CN+kCujaj86dtz1W9cCAwEAAQ==
 -----END RSA PUBLIC KEY-----
diff --git a/hosts/ljubljana2 b/hosts/ljubljana2
index f598c95..0a39b02 100644
--- a/hosts/ljubljana2
+++ b/hosts/ljubljana2
@@ -1,4 +1,4 @@
-address = AS64768.linuxshell.org
+#Address = AS64768.linuxshell.org
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBALVdchpMeSOA0JBBLwMMdX7hVMlLI2nXZ/0+b8R+36chmsajbKjsDa04
 aw/t/YFo7iLFi3AAXj7Tm/8AXkRz6Rf93rplwo91k47Dz4iEwC/kn7kI8wrGyaTY
diff --git a/hosts/mainz2 b/hosts/mainz2
index 5ecf8b8..ab589b5 100644
--- a/hosts/mainz2
+++ b/hosts/mainz2
@@ -1,3 +1,5 @@
+Address = ic-mainz2.freifunk-mainz.de
+Port = 10655
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEA4etejQVw/F3c5TlL8vHuO0dxdyPem+8yV6VUu++uexbGpwB6mMQV
 RDImqz9KM6AND5wSH2kcO9qmY+q5Tg7VmGvITYvVZWwaSihqKVcCj2lgQUUrn2IO
diff --git a/hosts/monitoringmoehne b/hosts/monitoringmoehne
new file mode 100644
index 0000000..9bf2b87
--- /dev/null
+++ b/hosts/monitoringmoehne
@@ -0,0 +1,15 @@
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEApOhvm7ohievOIunqK7L2zb1Y40msF65qvwRzLr58x9byIp3pw7Ay
+u/wB/U35D5kVOroV6Ar6u4O4HjVdJD+aAPC/w175R+E4tiSfvH9qMwKuL5vBnolJ
+K6tHUHSEN783Xd4KXLjf+BQQ7IDQIMXsbhqqwBPqtC29Y8RFTpon+m4DkbHT07jj
+R7XieIIlEFjbooFOSf62AyhBO5HzNVunIxg+LuZvy0LnO1rCpdqRXu0PqrftrXWv
+Q1nRw23mXrEmpVH6Mu+0xNWMwpWRsyXSY+NPFOrhOx/Yw8PoF8PtnZC4+YRvkVvg
+VITfgH6WmGRrnB4gJL1912nfqXw/yWtbtubJMARhO8HrMQNvXnlBWdP+o7hBXEPx
+NLMypTmkQXMvZ9LPGifsyPGvU5vaYFnZO5bYRIrrtPvqr56itFpLh4getBK6OUTY
+iNRcd74VmVrrdRgIaiR9v7Sm9qc1krUZSGQSoKUC5tWhS5VVxh/pzmHJu2mGdHqk
+xw+41dAVrURsHwS+Tozqg9Z5g6P51+P3WlQz4dY02bw/zGOKV6CBJvv8+t3OPyNH
+xQkprFWzIi1R20EzprDVChrg8dRt//hdwm2o9mRHL7cdkYYAXewIJrgPkUAT4aOX
+FwPyncKXmmrWAQrN4hQagXoVbYkMt2fHRO3aZvEH/Ub/SJj+P4464lMCAwEAAQ==
+-----END RSA PUBLIC KEY-----
+
diff --git a/hosts/muenchen1 b/hosts/muenchen1
new file mode 100644
index 0000000..73b1c6e
--- /dev/null
+++ b/hosts/muenchen1
@@ -0,0 +1,10 @@
+Address = gw01.freifunk-muenchen.de
+Port = 656
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA20ydh6auuT+FCBp5RiOP0PxaH356/zx3YxO18q8bJFnVXIyrVhLO
+QnhDGpEqYcccNMdmVPHQiroWsfOrNwBf69OyZobndbHVfFCC/HNtVl3EHPRClIeS
+oIyGWvXpnXCrpCUfghNPhAt/JoUM5fkKkNA+/vyJzU+RTBu6A1h3HnGshDMDnt5T
+Fe2J/8S00p0M8NjZiRyRMwhq8cx2XpK4rRN41Rr77Mafe6dhM9w73hCHp/GX1W8S
+2wByI+yoUMz8ld35iYoKEVQkWapGrvG/4ZvSJkZw7dtwJuRxyoXdjCROKWsTPDnR
+TIuD7yd4DSboEk9kCED4O4BPtMYFDIlkUwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/muenchen4 b/hosts/muenchen4
new file mode 100644
index 0000000..5f2294a
--- /dev/null
+++ b/hosts/muenchen4
@@ -0,0 +1,11 @@
+Address = ffm.netz.org
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAn7jl+pcXgObhzpo77iAYNaXQ7xDPFkI3J1XBVP/4mlMWaNMRP/MX
+rQn5AmECqrjp+iXgJHiZqO3V+SraYv402Ry1Q9nugKuF8oaY3kogsT2HNWlp5TsA
+LtkQb4VLl6hMAYQ++y3lCG1URipQ5F+K2N5ofBJHAcqnSukgz2Fsn6gNs9nZHci2
+u7HYi0kpCLpqej9DyijNC1aCVF2HrkPq6P87CXnfZiWjbjGbiB2xj1GHmI5VdyvA
+GBlt+Xpm09V0sy1YBwGEeqSRvhIiZbJFz2wr2kIVkv7ZRyn4OqnzXkml6Bnhc948
++2whuRYgWXVWyK4tpFdIg9Oa1GeHt5QWvQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/muenster1 b/hosts/muenster1
new file mode 100644
index 0000000..f827c19
--- /dev/null
+++ b/hosts/muenster1
@@ -0,0 +1,10 @@
+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/mueritz_bgp1 b/hosts/mueritz_bgp1
new file mode 100644
index 0000000..dd8b597
--- /dev/null
+++ b/hosts/mueritz_bgp1
@@ -0,0 +1,11 @@
+Address = gw05.4830.org
+Port = 655
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAuizkPDLiPvMxnom5i6RG0ijqT9tKmuAFWdMT8FIPoP+d4x0M+1WF
+F8tPZk6Si1t7AX9Cp4ZhPHbbwvSXb/P4Q2VLX2w0A9F67bZQFUBKCaGdRuFPXd2/
+aPr2mQQFB0agA5rkQgegRVbFhKhxGE3UMLhP2DYkfTSI7Yw0oyzGOnSK1Jga5Y9Z
+8W/sxPxj0rpAt/NFfl88qI9aiOYmOD8aFu+spQnNi9/K2yXVdYul0w7w2KAnCyjq
+QWZbNzxFT6Lnlr4YnpuN3Yd81eeThPbH9of2wdMKyJSL6cYM+zZxCeniscspWrRw
+3LPyinT/hEHLChkrQY507QQWXCM588yZeQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/oldenburg1 b/hosts/nordwest1
similarity index 86%
rename from hosts/oldenburg1
rename to hosts/nordwest1
index 7e362c2..00525fd 100644
--- a/hosts/oldenburg1
+++ b/hosts/nordwest1
@@ -1,4 +1,4 @@
-address = icvpn1.freifunk-ol.de
+address = vpn01.nordwest.freifunk.net
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBAL0EZpLOsOimfcTybJByDdI39NjG7Hmu456sYpJTbNt1wFW8BqrtcWCx
 +lv6+kS0Vx1z3KBjPh5H4wSCP00SmNcFKMde5+2LAe6mQcAs/daRhccyw9T1f6uy
diff --git a/hosts/nordwest2 b/hosts/nordwest2
new file mode 100644
index 0000000..03d07ab
--- /dev/null
+++ b/hosts/nordwest2
@@ -0,0 +1,10 @@
+address = vpn02.nordwest.freifunk.net
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAuGBmUHbebSU+Yvic9mTbjkUdRrsJEL+oVhRESBFNu0Z1tXDph4Co
+sCvYHuP2654RmZDqS8q6G7X6Grma19WJrqjmZsJ3jqpV8Ky76tihHv/SxolyFS5K
+PN+fJkZ2W9lCOgO3gvMx1XTwNxGQQlOjbaqFX7JqjCY9gLIZo+RbWm3qp7tHyfnf
+akU5PwcHlUoxHM6O8lvp1MJHmYB25swVeaIT0e5yFk0zO8RdotW4LrXXabAUz3Th
+iVJHfxifJ+6tIcuX7JeFLSIiwV19ihV0IPN04QiAY2PiNlfingbpYnV7f8A7LZ/D
+SPOniPi06Q9xry7foM/Y+uUvcw7iaV7fawIDAQAB
+-----END RSA PUBLIC KEY-----
+
diff --git a/hosts/nordwest3 b/hosts/nordwest3
new file mode 100644
index 0000000..cbd2ee9
--- /dev/null
+++ b/hosts/nordwest3
@@ -0,0 +1,10 @@
+address = vpn03.nordwest.freifunk.net
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1Xki3dIEeI/6rj9PoG/m6/M35Rtv510Xum5KtPrqHOcwaoFKXufR
+BCd5hFYLuWZy9DHUkk67BIgjnPktdJCGvQKwVvFlh7/UNLw+ylyKRt7OoF3RpnOK
+QilT90JeoMLLEmk9AXv6K+Q9hF0NGE/bGoJOJ5K4qTW2jffgHxcjFvOspd13zIxS
+OPP/12CMrcpW3g4tYEgGhetSMiwKdtWktctxU1ILwjRH15/hQOM4zSVNnWXxTGJh
+3+7QgCOpmbEb2VEqOuyNMoJnzFrSxwEiVjnVSvrvzXIBa8vapoUn2MJuazy5bsxk
+NYWWhLtm3fTiRxcqWbIewimZvobYqYGrnQIDAQAB
+-----END RSA PUBLIC KEY-----
+
diff --git a/hosts/nrw3 b/hosts/nrw3
new file mode 100644
index 0000000..e6f8583
--- /dev/null
+++ b/hosts/nrw3
@@ -0,0 +1,16 @@
+Address=thor.freifunk-nrw.de
+Address=148.251.117.6
+Address=2a01:4f8:202:63d3::2
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEA5SfOg64T5gKpoGR9LZYbhEfkVNyHQsz+JCLoa/JTjVEPJylS9qEl
+e3NXNmS+dyhVsvBpKwM3b7mn0TB24DEDH5s5WdU3jqnMVLD4YV51rt7XUphraRGH
+k7h8/kzAVYZfXho2SplsE/x6YX5Vot1A6+sPRmqEgWsmk3will2bPRw1fd1jbVOX
+E8k5zA3ChQmlCqR5O0ytwIpebcoOttAMU20O4gaZDOqbhCUy1FEqQTPS3XIQbp13
+VEUTkss0wfT8Ai6cF8cP9p1O7VmbQCUkUY+vjFlWnpu8msDtWIkQGDMXfFjb8IpW
+99q6gPz6pDihNY31nCG2ugKJ59db4tp+j7TUiPH4HAlhTl4UZWAAXz8i+4EguI6l
+oLUBKdgKcZklOv3DVxX+SpdnjODxXF2utyP825qjodRVO0mI36l4zmmzBvAqW+Xi
+oky+j7IpKfzLEu1f5toTOqTrV7Xr59hB/yHTF9dymgbAaoWyMD+/a5hZurDrziWX
+B/CcFkA7kOB8p0b6ELcel4L/iyjCCoTJIfHJUE7+cC5ZuJvlcBsHNv6rTBCHS0OR
+g2aHlSlETkuEH7xcO2Pzc1nCHUdVLrCFSZu+EY9OsMN53MQtGfZ5UYtB1Pjz1uGS
+BWFe9MRxwhw1yOvhj4lnPodPS8VDfT5ADcTkjkjbxxPR8ZYJ7jPSMU8CAwEAAQ==
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/paderborn01 b/hosts/paderborn01
new file mode 100644
index 0000000..eee33ed
--- /dev/null
+++ b/hosts/paderborn01
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..806ac52
--- /dev/null
+++ b/hosts/paderborn02
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index cc159ea..0000000
--- a/hosts/rheinland0
+++ /dev/null
@@ -1,8 +0,0 @@
------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
deleted file mode 100644
index eb81bf8..0000000
--- a/hosts/rheinland1
+++ /dev/null
@@ -1,8 +0,0 @@
------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
deleted file mode 100644
index 57ebb0b..0000000
--- a/hosts/rheinland2
+++ /dev/null
@@ -1,9 +0,0 @@
------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
new file mode 100644
index 0000000..223b531
--- /dev/null
+++ b/hosts/rheinufer1
@@ -0,0 +1,10 @@
+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/hosts/schwarzach1 b/hosts/schwarzach1
index 46ce3b2..2bc46bf 100644
--- a/hosts/schwarzach1
+++ b/hosts/schwarzach1
@@ -1,4 +1,4 @@
-Address = schwarzach1.hopto.org
+#Address = schwarzach1.hopto.org
 
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEApZQmRinQZQq7gPjFmltgFxXAv4REhkCAGcPwYl3uUeOwqe4adSDu
diff --git a/hosts/westpfalz1 b/hosts/westpfalz1
new file mode 100644
index 0000000..aba1242
--- /dev/null
+++ b/hosts/westpfalz1
@@ -0,0 +1,11 @@
+Address = gw01.freifunk-westpfalz.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1LnSTUhVzvecqhI6pvSPqTA7el2SPgi94gKa3FnDlMP9b6rCAVMg
+hSHXyzKuYa0/LBX3/msDkeKojpUSMagqeXpMqvzSBP5h6BO/fJ43KQ/PBpIInLiF
+hgTwJrxgi3hnVPzUOWYdcCSR1b7Y9WmD8E2ejfNPl4hwvER8oSto4iPAv1Zibv2h
+peMUx184jdr47WUPdhAL41ZUaktoxTuQvtd2bAUdeDL7DypAm1txKJubbXGJHdpt
+WLJKDb638TBfPyIwl45/m+ePhVHdoaYYC1oo1i0KHpznm1I06YHSMHarl9VAa21q
+la/GGd00CsuW97S962angzScLaJ3fUUBcwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/wiesbaden1 b/hosts/wiesbaden1
index 2acb502..6da2cf6 100644
--- a/hosts/wiesbaden1
+++ b/hosts/wiesbaden1
@@ -1,4 +1,4 @@
-Address = 176.9.204.70
+Address = ic-wiesbaden1.freifunk-wiesbaden.de
 Port = 10655
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAwGbnNJm4sKnR51MP9hIBwFYfVbC8pVrlPyqk8wCn2GHKBYAEUW9u
diff --git a/hosts/mainz1 b/hosts/wiesbaden2
similarity index 90%
rename from hosts/mainz1
rename to hosts/wiesbaden2
index 716cd3f..a5224be 100644
--- a/hosts/mainz1
+++ b/hosts/wiesbaden2
@@ -1,4 +1,4 @@
-Address = 94.23.58.68
+Address = ic-wiesbaden2.freifunk-wiesbaden.de
 Port = 10655
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAufGn5fV5dXxyQ75F1SARYxe3/7dDgcAsLp2IB8hXlQ6GGw/viYhF
diff --git a/scripts/post-merge b/scripts/post-merge
old mode 100644
new mode 100755
index 373c349..f45b79f
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -1,10 +1,30 @@
 #!/bin/bash
 
-# post-merge hook für Debian um tinc zu reloaden
+# post-merge hook for Debian systems
+#
+# 1. copy to .git/hooks
+# 2. to test run ".git/hooks/post-merge"
+# 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/"
 #
-# 1. nach .git/hooks kopieren
-# 2. git pull -q ausführen zum testen
-# 3. cronjob erstellen, der git pull -q im richtigen
-#    Verzeichnis ausführt
 
-/etc/init.d/tinc reload icvpn
+fail() {
+  echo "$1" >&2
+  exit 1
+}
+
+BASE=$(git rev-parse --show-toplevel)
+TINCCFG=$BASE/tinc.conf
+test -w $TINCCFG || fail "ERR: $TINCCFG is not writeable"
+
+sed -i '/^ConnectTo/d' $TINCCFG
+
+for HOST in hosts/*; do
+  # skip hosts without address
+  grep -q '^Address' -- "$HOST" || continue
+
+  echo "ConnectTo = ${HOST##*/}" >> $TINCCFG
+done
+
+invoke-rc.d tinc reload icvpn
+
+exit 0