diff --git a/CHANGES b/CHANGES
index 618649b3a..05cab5366 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 0.5.2 (in development)
 ==============================
 
+* Actually make the ``-Q`` option work.
+
 * #86: Fix explicit document titles in toctrees.
 
 * #81: Write environment and search index in a manner that is safe
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index 20767f0d4..c9a35c61a 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -56,7 +56,7 @@ def main(argv):
         nocolor()
 
     try:
-        opts, args = getopt.getopt(argv[1:], 'ab:d:c:CD:A:NEqP')
+        opts, args = getopt.getopt(argv[1:], 'ab:d:c:CD:A:NEqQP')
         allopts = set(opt[0] for opt in opts)
         srcdir = confdir = path.abspath(args[0])
         if not path.isdir(srcdir):