diff --git a/Makefile.config.in b/Makefile.config.in
index 73d9762e..36a4d97d 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -144,6 +144,7 @@ CONFIG_INTERLINK = @CONFIG_INTERLINK@
 CONFIG_IPV6 = @CONFIG_IPV6@
 CONFIG_DBLATEX = @CONFIG_DBLATEX@
 CONFIG_LEDS = @CONFIG_LEDS@
+CONFIG_LIBCSS = @CONFIG_LIBCSS@
 CONFIG_LZMA = @CONFIG_LZMA@
 CONFIG_MAILCAP = @CONFIG_MAILCAP@
 CONFIG_MANUAL = @CONFIG_MANUAL@
diff --git a/configure.ac b/configure.ac
index 54718dc4..b59d0751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -874,11 +874,16 @@ fi
 # Check for libcss
 # ===================================================================
 
+CONFIG_LIBCSS=
+
 if test "x$CONFIG_XML" = xyes; then
-	LIBCSS_CFLAGS=`$PKG_CONFIG $pkg_config_static --cflags libcss`
-	LIBCSS_LIBS=`$PKG_CONFIG $pkg_config_static --libs libcss`
+	LIBCSS_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags libcss)"
+	LIBCSS_LIBS="$($PKG_CONFIG $pkg_config_static --libs libcss)"
 	LIBS="$LIBS $LIBCSS_LIBS"
 	CFLAGS="$CFLAGS $LIBCSS_CFLAGS"
+	CONFIG_LIBCSS=yes
+	EL_CONFIG(CONFIG_LIBCSS, [libcss])
+	AC_SUBST(CONFIG_LIBCSS)
 fi
 
 # ===================================================================
diff --git a/src/document/Makefile b/src/document/Makefile
index da455fb6..f790bab0 100644
--- a/src/document/Makefile
+++ b/src/document/Makefile
@@ -2,6 +2,7 @@ top_builddir=../..
 include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_CSS)	+= css
+SUBDIRS-$(CONFIG_LIBCSS)	+= css2
 SUBDIRS-$(CONFIG_DOM)	+= dom
 SUBDIRS-$(CONFIG_XML)	+= xml
 
diff --git a/src/document/css2/Makefile b/src/document/css2/Makefile
new file mode 100644
index 00000000..3413e154
--- /dev/null
+++ b/src/document/css2/Makefile
@@ -0,0 +1,6 @@
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
+
+OBJS = css.obj
+
+include $(top_srcdir)/Makefile.lib