diff --git a/lib/options.nix b/lib/options.nix
index e10c86dd5064..9446eca36778 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -85,6 +85,7 @@ rec {
     concatMap (opt:
       let
         docOption = rec {
+          loc = opt.loc;
           name = showOption opt.loc;
           description = opt.description or (throw "Option `${name}' has no description.");
           declarations = filter (x: x != unknownModule) opt.declarations;
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 66fa4f0ba43c..bbe82066aa0c 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -63,18 +63,17 @@ let
   stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip;
 
   # Custom "less" that pushes up all the things ending in ".enable*"
-  # and ".package"
-  optionListLess = a: b:
+  # and ".package*"
+  optionLess = a: b:
     let
-      splt = lib.splitString ".";
       ise = lib.hasPrefix "enable";
       isp = lib.hasPrefix "package";
       cmp = lib.splitByAndCompare ise lib.compare
                                  (lib.splitByAndCompare isp lib.compare lib.compare);
-    in lib.compareLists cmp (splt a) (splt b) < 0;
+    in lib.compareLists cmp a.loc b.loc < 0;
 
   # Customly sort option list for the man page.
-  optionsList = lib.sort (a: b: optionListLess a.name b.name) optionsListDesc;
+  optionsList = lib.sort optionLess optionsListDesc;
 
   # Convert the list of options into an XML file.
   optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList);