diff --git a/srcpkgs/expat/expat-devel.template b/srcpkgs/expat/expat-devel.template
index 8a051bba3fc..faec33d290b 100644
--- a/srcpkgs/expat/expat-devel.template
+++ b/srcpkgs/expat/expat-devel.template
@@ -1,18 +1,13 @@
 # Template file for 'expat-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
+Add_dependency run expat ">=${version}"
 
-Add_dependency run expat
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index b56250afc43..4b21bc8edb6 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,12 +1,13 @@
 # Template file for 'expat'
 pkgname=expat
-version=2.0.1
-revision=2
+version=2.1.0
+homepage="http://expat.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/expat/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="XML parser library written in C"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
+license="MIT"
+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