diff --git a/lib/configure.py b/lib/configure.py
index cad150282e..71f7521ec3 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -330,13 +330,13 @@ def addEditorAlternatives(rcs):
         if len(rcs) == 1:
             m = r.match(rcs[0])
             if m:
-                alt = r'\editor_alternatives ' + m.group(1) + " %%"
+                alt = r'\editor_alternatives ' + m.group(1) + ' "%%"'
         elif len(rcs) > 1:
             m = r.match(rcs[idxx])
             if m:
                 if idxx > 0:
                     alt += '\n'
-                alt += r'\editor_alternatives ' + m.group(1) + " %%"
+                alt += r'\editor_alternatives ' + m.group(1) + ' "%%"'
     return alt
 
 
diff --git a/status.20x b/status.20x
index a5c8e92369..f3e58c5551 100644
--- a/status.20x
+++ b/status.20x
@@ -226,3 +226,6 @@ What's new
 
 - Avoid annoying warnings with newer gcc versions.
 
+- Properly quote arguments in configuration (bug 8648).
+
+