diff --git a/configure b/configure
index 1e44fed..5f9c4a0 100755
--- a/configure
+++ b/configure
@@ -50,7 +50,8 @@ usage: $0 [OPTION..]
 $s
 
       --no-shared                   Don't build shared libraries
-      --no-static                   Don't build static librairies
+      --no-static                   Don't build static libraries
+      --no-doc                      Don't build documentation
 
       --prefer-shared               Prefer to link shared libraires [default]
       --prefer-static               Prefer to link static libraires
@@ -84,6 +85,7 @@ sysdeps=
 prefer=shared
 noshared=0
 nostatic=0
+nodoc=0
 
 CVARS=
 CPPFLAGS=$CPPFLAGS
@@ -122,6 +124,7 @@ for arg ; do
         else error 1 "invalid option '$arg'"; fi;;
         --no-shared) noshared=1 ;;
         --no-static) nostatic=1 ;;
+        --no-doc|--no-docs|--no-documentation) nodoc=1 ;;
         --prefer-shared) prefer=shared ;;
         --prefer-static) prefer=static ;;
         --set-shared=*) eval "link${arg#*=}=1" ;;
@@ -570,15 +573,22 @@ setoptionsflags
 
 
 if test $(($noshared + $nostatic)) -gt 0; then
-    echo " => Librairies"
+    echo " => Libraries"
     if test $noshared -eq 1; then
-        echo "  -> Don't build shared librairies"
+        echo "  -> Don't build shared libraries"
     fi
     if test $nostatic -eq 1; then
-        echo "  -> Don't build static librairies"
+        echo "  -> Don't build static libraries"
     fi
 fi
 
+if test $nodoc -eq 1; then
+    cat <<EOF
+ => Miscellaneous
+  -> Don't build documentation
+EOF
+fi
+
 echo " => Generating files..."
 
 echo "  -> Generating config.mk..."
@@ -636,6 +646,7 @@ setupobjs()
         if test "$name" = "*" || test "$name" = "include"; then continue; fi
         local objs
         if test "$name" = "doc"; then
+            if test $nodoc -eq 1; then continue; fi
             objs="$(find "$d" -type f -name '*.md')"
             for i in {9..0}; do
                 local s="$(echo "$objs" \