diff --git a/certbot/client.py b/certbot/client.py
index 0159d3946..a81b7cd70 100644
--- a/certbot/client.py
+++ b/certbot/client.py
@@ -398,6 +398,7 @@ class Client(object):
         hsts = config.hsts if "ensure-http-header" in supported else False
         uir = config.uir if "ensure-http-header"  in supported else False
         staple = config.staple if "staple-ocsp" in supported else False
+        must_staple = config.must_staple
 
         if redirect is None:
             redirect = enhancements.ask("redirect")
@@ -411,11 +412,11 @@ class Client(object):
         if uir:
             self.apply_enhancement(domains, "ensure-http-header",
                     "Upgrade-Insecure-Requests")
-        if staple:
+        if staple or must_staple:
             self.apply_enhancement(domains, "staple-ocsp")
 
         msg = ("We were unable to restart web server")
-        if redirect or hsts or uir or staple:
+        if redirect or hsts or uir or staple or must_staple:
             with error_handler.ErrorHandler(self._rollback_and_restart, msg):
                 self.installer.restart()
 
diff --git a/certbot/interfaces.py b/certbot/interfaces.py
index 8e8666e70..19d9f0c07 100644
--- a/certbot/interfaces.py
+++ b/certbot/interfaces.py
@@ -201,9 +201,9 @@ class IConfig(zope.interface.Interface):
         "Email used for registration and recovery contact.")
     rsa_key_size = zope.interface.Attribute("Size of the RSA key.")
     must_staple = zope.interface.Attribute(
-        "Whether to request the OCSP Must Staple certificate extension. "
-        "Additional setup may be required after issuance. This does not "
-        "currently autoconfigure web servers for OCSP stapling. ")
+        "Adds the OCSP Must Staple extension to the certificate."
+        "Autoconfigures OCSP Stapling for supported setups "
+        "(Apache version >= 2.3.3 ).")
 
     config_dir = zope.interface.Attribute("Configuration directory.")
     work_dir = zope.interface.Attribute("Working directory.")