diff --git a/letsencrypt/client/CONFIG.py b/letsencrypt/client/CONFIG.py
index 7d0b581fb..e65277221 100644
--- a/letsencrypt/client/CONFIG.py
+++ b/letsencrypt/client/CONFIG.py
@@ -2,8 +2,8 @@
 import os.path
 
 
-ACME_SERVER = "letsencrypt-demo.org"
-"""CA hostname.
+ACME_SERVER = "letsencrypt-demo.org:443"
+"""CA hostname (and optionally :port).
 
 If you create your own server... change this line
 
diff --git a/letsencrypt/client/network.py b/letsencrypt/client/network.py
index 82c98c363..2ec93136d 100644
--- a/letsencrypt/client/network.py
+++ b/letsencrypt/client/network.py
@@ -17,11 +17,15 @@ logging.getLogger("requests").setLevel(logging.WARNING)
 class Network(object):
     """Class for communicating with ACME servers.
 
-    :ivar str server: Certificate authority server (server[:port])
-    :ivar str server_url: Full URL of the CSR server
+    :ivar str server_url: Full URL of the ACME service
 
     """
     def __init__(self, server):
+        """Initialize Network instance.
+
+        :param str server: ACME (CA) server[:port]
+
+        """
         self.server_url = "https://%s/acme/" % server
 
     def send(self, msg):
diff --git a/letsencrypt/scripts/main.py b/letsencrypt/scripts/main.py
index ff3c3c792..c308b55da 100755
--- a/letsencrypt/scripts/main.py
+++ b/letsencrypt/scripts/main.py
@@ -30,7 +30,7 @@ def main():
     parser.add_argument("-d", "--domains", dest="domains", metavar="DOMAIN",
                         nargs="+")
     parser.add_argument("-s", "--server", dest="server",
-                        help="The ACME CA server address.")
+                        help="The ACME CA server [%s]." % CONFIG.ACME_SERVER)
     parser.add_argument("-p", "--privkey", dest="privkey", type=read_file,
                         help="Path to the private key file for certificate "
                              "generation.")