diff --git a/Makefile.am b/Makefile.am
index 167c657a..a825b229 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,10 @@ coverage:
 	genhtml --output-directory @lcov_output_directory@ coverage/coverage.info
 endif
 
+################################################################################
+# Section for the I18N processing
+################################################################################
+
 # make update-lang PO=<lang>
 # ==========================
 # Update the PO files against the POT file in all the translation sub-directories
@@ -87,6 +91,27 @@ endif
 
 .PHONY: update-lang
 
+################################################################################
+# Section related to generating HTML content for the website
+################################################################################
+
+if WITH_WEB_REPO
+
+SUBDIRS_WEB = doc
+
+website:
+	@for subdir in $(SUBDIRS_WEB); do \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) website || exit $$?); \
+	done
+
+endif
+
+.PHONY: website
+
+################################################################################
+# Section for the automated checks
+################################################################################
+
 # Create a 'silent-rule' for our make check the same way automake does
 AM_V_CHKOPTS = $(am__v_CHKOPTS_$(V))
 am__v_CHKOPTS_  = $(am__v_CHKOPTS_$(AM_DEFAULT_VERBOSITY))
diff --git a/configure.ac b/configure.ac
index 2d06a27c..6b12b1e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,6 +232,18 @@ AS_IF([test "x$debug" = "xyes"],
 ])
 
 
+dnl To upload documentation to the Website
+dnl ======================================
+AC_ARG_WITH([web-repo],
+    [AS_HELP_STRING([--with-web-repo=PATH], [path to your git repository for the Web home page (maintainer stuff)])],
+    [AS_CASE([$withval],
+        [yes], [AC_MSG_ERROR([bad value '$withval' for --with-web-repo, expected a path]) ],
+        [no],  [WEB_REPO_ROOT=""],
+        [WEB_REPO_ROOT=$withval])],
+    [WEB_REPO_ROOT=""])
+WM_CHECK_WEBREPODIR
+
+
 dnl Support for Nested Functions by the compiler
 dnl ============================================
 WM_PROG_CC_NESTEDFUNC
@@ -918,6 +930,8 @@ echo "Supported graphic format libraries  :$supported_gfx"
 echo "Unsupported features                :$unsupported"
 echo "Pango text layout support in WINGs  : $pango"
 echo "Translated languages to support     :$supported_locales"
+AS_IF([test "x$WEB_REPO_ROOT" != "x"],
+    [AS_ECHO(["Git repository for WMaker's Website : $WEB_REPO_ROOT"]) ])
 AS_IF([test "x$debug" = "xyes"],
     [AS_ECHO(["Debug enabled: CFLAGS = $CFLAGS"]) ])
 echo
diff --git a/doc/build/Compilation.texi b/doc/build/Compilation.texi
index dd5ff12c..f1a8a596 100644
--- a/doc/build/Compilation.texi
+++ b/doc/build/Compilation.texi
@@ -639,6 +639,14 @@ appropriate requirements and works with this.
 Despite all this, if you think there's a use for it and feel in the mood to help, do not hesitate to
 discuss on the mailing list @value{emailsupport} to get it working.
 
+@item --with-web-repo=@i{PATH}
+Enable generation of HTML documentation to be uploaded to @sc{Window Maker}'s website.
+The @file{@i{PATH}} is the directory where you have cloned the homepage's repository.
+
+When enabled, the command @command{make website} generates a few HTML pages
+and copy them into the specified directory, then you can commit them to publish on the web site.
+You should not do that, it is handled by the development team.
+
 @end table
 
 
diff --git a/m4/windowmaker.m4 b/m4/windowmaker.m4
index de2c79f1..796e51f5 100644
--- a/m4/windowmaker.m4
+++ b/m4/windowmaker.m4
@@ -194,6 +194,29 @@ m4_popdef([USEVAR])dnl
 ])
 
 
+# WM_CHECK_WEBREPODIR
+# -------------------
+#
+# If the maintainer's option --with-web-repo was specified, check that the path provided is a valid
+# existing directory and that it is a GIT repository that looks like Window Maker's Website repo.
+AC_DEFUN_ONCE([WM_CHECK_WEBREPODIR],
+[AS_IF([test "x$WEB_REPO_ROOT" != "x"],
+    [AS_IF([test ! -d "$WEB_REPO_ROOT"],
+         [AC_MSG_ERROR([The path "$with_web_repo" is not a directory, for --with-web-repo])])
+
+     # Convert to an Absolute path in the case it is not
+     WEB_REPO_ROOT=`cd "$WEB_REPO_ROOT" ; pwd`
+
+     AS_IF([test ! -d "$WEB_REPO_ROOT/.git"],
+         [AC_MSG_ERROR([The path "$WEB_REPO_ROOT" is not a GIT repository, for --with-web-repo])])
+     AS_IF([test ! -f "$WEB_REPO_ROOT/_config.yml"],
+         [AC_MSG_ERROR([The path "$WEB_REPO_ROOT" does not look like Window Maker's website repository, for --with-web-repo])])
+    ])
+ AM_CONDITIONAL([WITH_WEB_REPO], [test "x$WEB_REPO_ROOT" != "x"])
+ AC_SUBST([WEB_REPO_ROOT])
+])
+
+
 # WM_FUNC_SECURE_GETENV
 # ---------------------
 #