diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 2bba4459d..64c2e23ca 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -824,7 +824,7 @@ def do_prompt(d, key, text, default=None, validator=nonempty):
             prompt = purple(PROMPT_PREFIX + '%s [%s]: ' % (text, default))
         else:
             prompt = purple(PROMPT_PREFIX + text + ': ')
-        x = term_input(prompt)
+        x = term_input(prompt).strip()
         if default and not x:
             x = default
         if not isinstance(x, unicode):
diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index dba888ddb..c054f8589 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -46,6 +46,25 @@ def teardown_module():
     coloron()
 
 
+def test_quickstart_inputstrip():
+    d = {}
+    answers = {
+        'Q1': 'Y\r',  # input() return with '\r' on Python-3.2.0 for Windows
+        'Q2': ' Yes \r',
+        'Q3': 'N',
+        'Q4': 'N ',
+    }
+    qs.term_input = mock_raw_input(answers)
+    qs.do_prompt(d, 'k1', 'Q1')
+    assert d['k1'] == 'Y'
+    qs.do_prompt(d, 'k2', 'Q2')
+    assert d['k2'] == 'Yes'
+    qs.do_prompt(d, 'k3', 'Q3')
+    assert d['k3'] == 'N'
+    qs.do_prompt(d, 'k4', 'Q4')
+    assert d['k4'] == 'N'
+
+
 def test_do_prompt():
     d = {}
     answers = {