diff --git a/Makefile.config.in b/Makefile.config.in
index 0b3bbce5..1b02df80 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -135,6 +135,7 @@ CONFIG_GNUTLS_OPENSSL_COMPAT = @CONFIG_GNUTLS_OPENSSL_COMPAT@
 CONFIG_GOPHER = @CONFIG_GOPHER@
 CONFIG_GPM = @CONFIG_GPM@
 CONFIG_GZIP = @CONFIG_GZIP@
+CONFIG_HTMLCXX = @CONFIG_HTMLCXX@
 CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@
 CONFIG_IDN = @CONFIG_IDN@
 CONFIG_INTERLINK = @CONFIG_INTERLINK@
diff --git a/configure.ac b/configure.ac
index f819e137..6502f498 100644
--- a/configure.ac
+++ b/configure.ac
@@ -643,6 +643,7 @@ AC_ARG_WITH([spidermonkey],
 # when we know for sure whether we're going to use SpiderMonkey or not.
 # (features.conf is not supposed to define it.)
 CONFIG_SPIDERMONKEY=
+CONFIG_HTMLCXX=
 EL_SAVE_FLAGS
 
 case "$with_spidermonkey" in
@@ -667,9 +668,14 @@ for package in mozjs-52; do
 		AC_MSG_CHECKING([for SpiderMonkey (mozjs-52) in pkg-config $package])
 		if $PKG_CONFIG $pkg_config_static --cflags --libs $package > /dev/null 2>&AS_MESSAGE_LOG_FD; then
 			DB_LOCALSTORAGE_LIBS="$($PKG_CONFIG $pkg_config_static --libs sqlite3)"
-			SPIDERMONKEY_LIBS="$($PKG_CONFIG $pkg_config_static --libs $package) $DB_LOCALSTORAGE_LIBS"
+			HTMLCXX_LIBS="$($PKG_CONFIG $pkg_config_static --libs htmlcxx)"
+			if test -n "$HTMLCXX_LIBS"; then
+				CONFIG_HTMLCXX=yes
+			fi
+			SPIDERMONKEY_LIBS="$($PKG_CONFIG $pkg_config_static --libs $package) $DB_LOCALSTORAGE_LIBS $HTMLCXX_LIBS"
 			DB_LOCALSTORAGE_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags sqlite3)"
-			SPIDERMONKEY_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags $package) $DB_LOCALSTORAGE_CFLAGS"
+			HTMLCXX_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags htmlcxx)"
+			SPIDERMONKEY_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags $package) $DB_LOCALSTORAGE_CFLAGS $HTMLCXX_CFLAGS"
 			LIBS="$SPIDERMONKEY_LIBS $LIBS_X"
 			CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS"
 			CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS"
@@ -697,6 +703,7 @@ done
 if test -z "$CONFIG_SPIDERMONKEY"; then
 	# Didn't find SpiderMonkey anywhere.
 	CONFIG_SPIDERMONKEY=no
+	CONFIG_HTMLCXX=no
 fi
 
 EL_RESTORE_FLAGS
@@ -709,6 +716,7 @@ fi
 
 EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_ECMASCRIPT_SMJS], [ECMAScript (JavaScript)])
 AC_SUBST(CONFIG_ECMASCRIPT_SMJS)
+EL_CONFIG(CONFIG_HTMLCXX, [HTMLcxx])
 
 if test "x$CONFIG_ECMASCRIPT_SMJS" = xyes &&
    test "x$HAVE_JS_TRIGGEROPERATIONCALLBACK" = xyes &&
diff --git a/src/document/Makefile b/src/document/Makefile
index 59541e0d..e41c69c3 100644
--- a/src/document/Makefile
+++ b/src/document/Makefile
@@ -3,6 +3,7 @@ include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_CSS)	+= css
 SUBDIRS-$(CONFIG_DOM)	+= dom
+SUBDIRS-$(CONFIG_HTMLCXX) += htmlcxx
 SUBDIRS-$(CONFIG_LIBDOM) += libdom
 
 SUBDIRS = html plain
diff --git a/src/document/htmlcxx/Makefile b/src/document/htmlcxx/Makefile
new file mode 100644
index 00000000..1e1b4a70
--- /dev/null
+++ b/src/document/htmlcxx/Makefile
@@ -0,0 +1,8 @@
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
+
+INCLUDES += $(HTMLCXX_CFLAGS)
+
+OBJS = renderer.o
+
+include $(top_srcdir)/Makefile.lib