diff --git a/modutils/modutils.c b/modutils/modutils.c
index cc718dbca..565d0d22f 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -71,6 +71,11 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv)
 	optlen = 0;
 	while (*++argv) {
 		options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
+		/* Older versions were enclosing space-containing *argv in "",
+		 * but both modprobe and insmod from module-init-tools 3.11.1
+		 * don't do this anymore. (As to extra trailing space,
+		 * insmod adds it but modprobe does not. We do in both cases)
+		 */
 		optlen += sprintf(options + optlen, "%s ", *argv);
 	}
 	return options;