diff --git a/build/m4/shamrock/gnome-doc.m4 b/build/m4/shamrock/gnome-doc.m4
index 3f5f638e..fe1d008c 100644
--- a/build/m4/shamrock/gnome-doc.m4
+++ b/build/m4/shamrock/gnome-doc.m4
@@ -4,7 +4,7 @@ AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS],
            AC_HELP_STRING([--enable-user-help], [Enable building the user-help [[default=auto]]]),,
            enable_user_help=auto)
 
-	if test "x$enable_user_help" = "xauto"; then
+    if test "x$enable_user_help" = "xauto"; then
         PKG_CHECK_MODULES(GNOME_DOC_UTILS,
             gnome-doc-utils,
             enable_user_help=yes, enable_user_help=no)
@@ -12,11 +12,11 @@ AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS],
         PKG_CHECK_MODULES(GNOME_DOC_UTILS, gnome-doc-utils)
     fi
 
-	if test "x$enable_user_help" = "xyes"; then
+    # GNOME_DOC_INIT sets ENABLE_SK, but if we have disabled
+    # user docs, then this needs to be defined manually.
+    AM_CONDITIONAL(ENABLE_SK, false)
+    if test "x$enable_user_help" = "xyes"; then
         GNOME_DOC_INIT([$1], enable_user_help=yes, enable_user_help=no)
-    else
-        AM_CONDITIONAL(ENABLE_SK, false)
-    fi
 
-	AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x$enable_user_help" = "xyes")
+    AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x$enable_user_help" = "xyes")
 ])