diff --git a/.gitignore b/.gitignore
index 1e8846f7..1f6c2c77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,8 @@ stamp-h1
 e16.spec
 e16*.tar.gz
 
+docs/*.html
+
 misc/e16-gnome.desktop
 misc/e16-kde.desktop
 misc/e16.desktop
diff --git a/Makefile.am b/Makefile.am
index 98ea0a79..b58c0fa5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = aclocal.m4 config.* configure depcomp \
 		       po/*.header po/*.sed po/*.sin po/e16.pot \
 		       *~ */*~
 
-SUBDIRS = dox eesh epp src lib config themes fonts man scripts misc po
+SUBDIRS = dox eesh epp src lib config themes fonts man scripts misc docs po
 
 EXTRA_DIST = \
 sample-scripts/bouncingball.pl \
diff --git a/configure.ac b/configure.ac
index fd4323df..4572fd42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,6 +328,17 @@ if test "x$enable_dialogs" = "xyes"; then
   AC_DEFINE(ENABLE_DIALOGS, 1, [Configuration dialog support])
 fi
 
+AC_ARG_ENABLE(docs,
+  [  --enable-docs           install html docs @<:@default=yes@:>@],,
+  enable_docs=yes)
+if test "x$enable_docs" = "xyes"; then
+  AC_CHECK_PROG(XMLTO, xmlto, xmlto)
+  if test "x$XMLTO" = "x"; then
+    enable_docs=no
+  fi
+fi
+AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
+
 AC_ARG_ENABLE(gcc-cpp,
   [  --enable-gcc-cpp        compile everything as if it were C++ @<:@default=no@:>@],,
   enable_gcc_cpp=no)
@@ -367,6 +378,7 @@ themes/Makefile
 fonts/Makefile
 scripts/Makefile
 misc/Makefile
+docs/Makefile
 po/Makefile.in
 e16.spec
 ])
@@ -409,6 +421,7 @@ echo "  ScreenSaver .................. $enable_xscrnsaver"
 echo "  D-Bus ........................ $enable_dbus"
 echo
 echo "Installation path .............. $prefix"
+echo "  Install HTML docs ............ $enable_docs"
 echo
 echo "Compilation .................... make"
 echo "Installation ................... make install"
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 00000000..747d8bc6
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,19 @@
+if HAVE_XMLTO
+
+#htmldir = $(pkgdatadir)/html
+html_DATA = index.html
+
+EXTRA_DIST = README-0.16.8.xml
+
+index.html: README-0.16.8.xml
+	$(XMLTO) html $<
+
+install-data-local:
+	mkdir -p $(DESTDIR)$(htmldir)
+	cp *.html $(DESTDIR)$(htmldir)/
+
+uninstall-local:
+	rm -f $(DESTDIR)$(htmldir)/*.html
+	rm -f *.html
+
+endif
diff --git a/e16.spec.in b/e16.spec.in
index 1ec34e0c..53293a2d 100644
--- a/e16.spec.in
+++ b/e16.spec.in
@@ -41,6 +41,7 @@ This package will install the Enlightenment window manager.
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
 rm -f $RPM_BUILD_ROOT/usr/lib*/e16/*.la
+rm -rf $RPM_BUILD_ROOT/usr/share/doc
 mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/Xclients.d
 cp $RPM_BUILD_ROOT/usr/share/e16/misc/Xclients.* $RPM_BUILD_ROOT/etc/X11/xinit/Xclients.d/
 
@@ -49,12 +50,13 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog README docs/README-0.16.8
+%doc AUTHORS COPYING ChangeLog README docs/README-0.16.8 docs/*.html
 %{_bindir}/*
 %{_libdir}/e16/*.so
 %{_datadir}/%{name}/*
 %{_datadir}/locale/*
 %{_datadir}/xsessions/*
+%{_docdir}/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 #%{_mandir}/*