diff --git a/client-webserver/client.py b/client-webserver/client.py
index ddf613699..8d562b9aa 100755
--- a/client-webserver/client.py
+++ b/client-webserver/client.py
@@ -29,8 +29,7 @@ def init(m):
     m.session = ""
 
 def make_request(m, csr):
-    # TODO: take recipient from os.environ["CHOCOLATESERVER"]
-    m.request.recipient = "ca.example.com"
+    m.request.recipient = os.environ["CHOCOLATESERVER"]
     m.request.timestamp = int(time.time())
     m.request.csr = csr
 
diff --git a/server-ca/chocolate.py b/server-ca/chocolate.py
index cfb8059da..b73f69162 100755
--- a/server-ca/chocolate.py
+++ b/server-ca/chocolate.py
@@ -12,6 +12,11 @@ from google.protobuf.message import DecodeError
 MaximumSessionAge = 100   # seconds, to demonstrate session timeout
 MaximumChallengeAge = 600 # to demonstrate challenge timeout
 
+try:
+    chocolate_server_name = open("SERVERNAME").read().rstrip()
+except IOError:
+    raise IOError, "Please create a SERVERNAME file containing the server name."
+
 urls = (
      '.*', 'session'
 )
@@ -217,7 +222,7 @@ class session(object):
         if time.time() - timestamp > 100:
             self.die(r, r.BadRequest, uri="https://ca.example.com/failures/past")
             return
-        if recipient != "ca.example.com":
+        if recipient != chocolate_server_name:
             self.die(r, r.BadRequest, uri="https://ca.example.com/failures/recipient")
             return
         if not CSR.parse(csr):