diff --git a/srcpkgs/expat/expat-devel.template b/srcpkgs/expat/expat-devel.template
index a4b20c7217..54d886307d 100644
--- a/srcpkgs/expat/expat-devel.template
+++ b/srcpkgs/expat/expat-devel.template
@@ -1,13 +1,13 @@
 # Template file for 'expat-devel'.
 #
-depends="expat>=2.1.0"
+depends="expat>=${version}"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
 do_install() {
 	vmove usr/include usr
 	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index 7e3bde3ee5..ae199201b2 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,17 +1,16 @@
 # Template file for 'expat'
 pkgname=expat
 version=2.1.0
-homepage="http://expat.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/expat/$pkgname-$version.tar.gz"
+revision=2
 build_style=gnu-configure
-revision=1
+subpackages="xmlwf expat-devel"
 short_desc="XML parser library written in C"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="http://expat.sourceforge.net/"
+distfiles="$SOURCEFORGE_SITE/expat/$pkgname-$version.tar.gz"
 checksum=823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
 long_desc="
  This is James Clark's expat XML parser library in C. It is a stream
  oriented parser that requires setting handlers to deal with the
  structure that the parser discovers in the document."
-
-subpackages="$pkgname-devel"
diff --git a/srcpkgs/expat/xmlwf.template b/srcpkgs/expat/xmlwf.template
new file mode 100644
index 0000000000..35d64d5b58
--- /dev/null
+++ b/srcpkgs/expat/xmlwf.template
@@ -0,0 +1,12 @@
+# Template file for 'xmlwf'.
+#
+short_desc="${short_desc} -- xmlwf utility"
+long_desc="${long_desc}
+
+ This package contains xmlwf(1), an utility that uses the expat library
+ to determine if an XML document is valid."
+
+do_install() {
+	vmove usr/bin usr
+	vmove usr/share usr
+}
diff --git a/srcpkgs/xmlwf b/srcpkgs/xmlwf
new file mode 120000
index 0000000000..0603602e73
--- /dev/null
+++ b/srcpkgs/xmlwf
@@ -0,0 +1 @@
+expat
\ No newline at end of file