diff --git a/doc/man-home-manager.xml b/doc/man-home-manager.xml
index 2f141d970..3bfe02302 100644
--- a/doc/man-home-manager.xml
+++ b/doc/man-home-manager.xml
@@ -115,7 +115,16 @@
    </arg>
     
    <arg>
-    --max-jobs <replaceable>number</replaceable>
+     <group choice="req">
+       <arg choice="plain">
+         -j
+       </arg>
+
+       <arg choice="plain">
+         --max-jobs
+       </arg>
+     </group>
+     <replaceable>number</replaceable>
    </arg>
     
    <arg>
@@ -417,6 +426,9 @@
     </listitem>
    </varlistentry>
    <varlistentry>
+    <term>
+     <option>-j <replaceable>number</replaceable></option>
+    </term>
     <term>
      <option>--max-jobs <replaceable>number</replaceable></option>
     </term>
diff --git a/home-manager/completion.bash b/home-manager/completion.bash
index e9f045789..d5b48258d 100644
--- a/home-manager/completion.bash
+++ b/home-manager/completion.bash
@@ -285,7 +285,8 @@ _home-manager_completions ()
     #--------------------------#
 
     local Options
-    Options=( "-f" "--file" "-b" "-A" "-I" "-h" "--help" "-n" "--dry-run" "-v" "--verbose" "--show-trace" )
+    Options=( "-f" "--file" "-b" "-A" "-I" "-h" "--help" "-n" "--dry-run" "-v" "--verbose" "--show-trace" \
+              "-j" "--max-jobs" )
 
     # ^ « home-manager »'s options.
 
diff --git a/home-manager/home-manager b/home-manager/home-manager
index 43303d5de..632198386 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -424,7 +424,7 @@ function doHelp() {
     echo "  --cores NUM"
     echo "  --keep-failed"
     echo "  --keep-going"
-    echo "  --max-jobs NUM"
+    echo "  -j, --max-jobs NUM"
     echo "  --option NAME VALUE"
     echo "  --show-trace"
     echo "  --(no-)substitute"
@@ -501,7 +501,7 @@ while [[ $# -gt 0 ]]; do
             PASSTHROUGH_OPTS+=("$opt" "$1" "$2")
             shift 2
             ;;
-        --max-jobs|--cores)
+        -j|--max-jobs|--cores)
             PASSTHROUGH_OPTS+=("$opt" "$1")
             shift
             ;;