diff --git a/configure.ac b/configure.ac
index 2efc945a20..7467db1022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,16 +68,19 @@ PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enab
 if test "x$enable_monodoc" = "xyes"; then
 	AC_PATH_PROG(MONODOCER, monodocer, no)
 	AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
-	if test x$MONODOCER = xno -o x$MDASSEMBLER = xno; then
+	AC_PATH_PROG(MONODOCS2HTML, monodocs2html, no)
+	if test x$MONODOCER = xno -o x$MDASSEMBLER = xno -o x$MONODOCS2HTML = xno; then
 		enable_monodoc=no
 	fi
 else
 	MONODOCER=
 	MDASSEMBLER=
+	MONODOCS2HTML=
 fi
 
 AC_SUBST(MONODOCER)
 AC_SUBST(MDASSEMBLER)
+AC_SUBST(MONODOCS2HTML)
 
 MONODOC_SOURCESDIR=`pkg-config --variable=sourcesdir monodoc`
 AC_SUBST(MONODOC_SOURCESDIR)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1abd491eee..fecfa17859 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,6 +28,9 @@ noinst_DATA = $(TARGETS)
 gstreamer-sharp-docs.zip gstreamer-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
 	$(MDASSEMBLER) --ecma $(srcdir)/en -o gstreamer-sharp-docs
 
+html: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
+	$(MONODOCS2HTML) -source:$(srcdir)/en -dest:html
+
 update: $(ASSEMBLIES)
 	LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(top_builddir)/gstreamer-sharp/glue/.libs \
 	$(MONODOCER) $(ASSEMBLIES_BUILD) -path:en -updateto:en -delete
@@ -42,3 +45,6 @@ dist-hook:
 	cp $(srcdir)/en/*.xml $(distdir)/en/
 	mkdir -p $(distdir)/en/Gst/
 	cp $(srcdir)/en/Gst/*.xml $(distdir)/en/Gst/
+
+distclean-local:
+	rm -rf html