diff --git a/ietf/settings.py b/ietf/settings.py
index 1e97c20d8..e1014c1c7 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -123,6 +123,12 @@ INTERNAL_IPS = (
 # shiraz and marsanne
         '81.232.110.214',
         '2001:16d8:ff54::1',
+# merlot
+        '194.146.105.14',
+        '2001:698:9:31:214:22ff:fe21:bb',
+# local
+        '127.0.0.1',
+        '::1',
 )
 
 # Valid values: