diff --git a/dev/infrastructure.rst b/dev/infrastructure.rst
index 3d90efe9f..8225288bf 100644
--- a/dev/infrastructure.rst
+++ b/dev/infrastructure.rst
@@ -24,13 +24,29 @@ Powered by Discourse.
 
 - `forum.syncthing.net <https://forum.syncthing.net/>`__ (Ubuntu Linux, 3072 MB)
 
-Global Discovery Server
------------------------
+Global Discovery Servers
+------------------------
 
-Runs the ``discosrv`` instances for v0.11 and v0.12 and PostgreSQL.
+Runs the ``discosrv`` instances for v0.11 and v0.12.
 
-- `announce.syncthing.net <http://announce.syncthing.net/>`__ (Ubuntu Linux, 512 MB)
-- announce-v6.syncthing.net (just an alias)
+- discovery-v4-1.syncthing.net (Ubuntu 14.04, 512 MB, hosted by :user:`calmh`)
+- discovery-v6-1.syncthing.net (alias for above)
+- discovery-v4-2.syncthing.net (Ubuntu 14.04, 512 MB, hosted at DigitalOcean)
+- discovery-v6-2.syncthing.net (alias for above)
+- discovery-v4-3.syncthing.net (Ubuntu 14.04, 512 MB, hosted at DigitalOcean)
+- discovery-v6-3.syncthing.net (alias for above)
+
+Relay Pool Server
+-----------------
+
+Runs the ``relaypoolsrv`` to handle dynamic registration and announcement of relays.
+
+- `relays.syncthing.net <http://relays.syncthing.net>`__ (SmartOS container, 256 MB)
+
+Relay Servers
+-------------
+
+Hosted by friendly people on the internet.
 
 Usage Reporting Server
 ----------------------
@@ -44,7 +60,8 @@ Build Servers, Core and Android
 
 Runs Jenkins and does the core and Android builds, Ubuntu Linux.
 
-- `build.syncthing.net <http://build.syncthing.net/>`__ (Ubuntu Linux, 4096 MB)
+- `build.syncthing.net <http://build.syncthing.net/>`__ (Jenkins frontend, SmartOS container, 2048 MB)
+- build2.syncthing.net (build runner, SmartOS container, 8192 MB)
 - `android.syncthing.net <http://android.syncthing.net/>`__ (Ubuntu Linux, 3072 MB)
 
 OSX and Windows Build Slaves
@@ -60,15 +77,6 @@ Serves the APT repository for Debian/Ubuntu users. Runs Nginx.
 
 - `apt.syncthing.net <http://apt.syncthing.net>`__ (SmartOS container, 256 MB)
 
-Relay Servers
--------------
-
-Runs the ``relaysrv`` that allows communication between otherwise
-blocked v0.12 clients.
-
--  `a.relays.syncthing.net <http://a.relays.syncthing.net:22070/status>`__ hosted by :user:`Zillode`
--  `b.relays.syncthing.net <http://b.relays.syncthing.net:22070/status>`__ hosted by :user:`calmh` (SmartOS container, 256 MB)
-
 Signing Server
 --------------