diff --git a/src/questions.py b/src/questions.py
index 37935ca70..f6aeb70b2 100644
--- a/src/questions.py
+++ b/src/questions.py
@@ -37,14 +37,26 @@ def expect(prompt, possibilities, recursed=False):
         prompt = '%s [%s]' % (prompt, '/'.join(possibilities))
     prompt = prompt.strip() + ' '
     s = raw_input(prompt)
+    s = s.strip()
     if possibilities:
         if s in possibilities:
-            return s.strip()
+            return s
         else:
             return expect(originalPrompt, possibilities, recursed=True)
     else:
         return s.strip()
 
+def expectWithDefault(prompt, possibilities, default):
+    prompt = prompt.strip() + ' '
+    prompt = '%s [%s] (default: %s) ' % \
+             (prompt.strip(), '/'.join(possibilities), default)
+    s = raw_input(prompt)
+    s = s.strip()
+    if s in possibilities:
+        return s
+    else:
+        return default
+
 def anything(prompt):
     return expect(prompt, [])