diff --git a/configure.in b/configure.in
index 77dbe993b..978181b66 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,18 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 IT_PROG_INTLTOOL([0.35.0])
 AM_GLIB_GNU_GETTEXT
 
+dnl
+dnl GNOME support
+dnl
+AC_ARG_WITH(docs, AC_HELP_STRING([--with-docs], [Build NetworkManager documentation]))
+AM_CONDITIONAL(WITH_DOCS, test "x$with_docs" = "xyes")
+case $with_docs in
+       yes) ;;
+       *)
+               with_docs=no
+               ;;
+esac
+
 dnl
 dnl Make sha1.c happy on big endian systems
 dnl
@@ -319,3 +331,8 @@ AC_OUTPUT
 echo
 echo Distribution targeting: ${with_distro}
 echo 'if this is not correct, please specifiy your distro with --with-distro=DISTRO'
+
+echo
+echo Building documentation: ${with_docs}
+echo
+