diff --git a/srcpkgs/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template
index 3d979c54501..8c619213348 100644
--- a/srcpkgs/xmlcatmgr/template
+++ b/srcpkgs/xmlcatmgr/template
@@ -1,12 +1,13 @@
 # Template build file for 'xmlcatmgr'.
 pkgname=xmlcatmgr
 version=2.2
-distfiles="$SOURCEFORGE_SITE/xmlcatmgr/$pkgname-$version.tar.gz"
+revision=2
 build_style=gnu-configure
-revision=1
-fulldepends="glibc"
 short_desc="XML and SGML catalog manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://xmlcatmgr.sourceforge.net"
+license="BSD"
+distfiles="$SOURCEFORGE_SITE/xmlcatmgr/$pkgname-$version.tar.gz"
 checksum=ea1142b6aef40fbd624fc3e2130cf10cf081b5fa88e5229c92b8f515779d6fdc
 long_desc="
  XML Catalog Manager (xmlcatmgr in its short form) is a small utility used
@@ -20,32 +21,38 @@ long_desc="
  for entities without having to modify the original document source."
 
 conf_files="
-/etc/sgml/catalog
-/etc/xml/catalog
-/usr/share/sgml/catalog
-/usr/share/xml/catalog"
+ /etc/sgml/catalog
+ /etc/xml/catalog
+ /usr/share/sgml/catalog
+ /usr/share/xml/catalog"
 
+if [ -n "$XBPS_CROSS_BUILD" ]; then
+	makedepends="xmlcatmgr"
+fi
 
 pre_install() {
+	if [ -n "$XBPS_CROSS_BUILD" ]; then
+		_xmlcatmgr="xmlcatmgr"
+	else
+		_xmlcatmgr="./xmlcatmgr"
+	fi
 	# Create XML and SGML catalogs once built.
 	echo "=> Creating SGML catalogs..."
-	$wrksrc/xmlcatmgr -sc $wrksrc/catalog.etc.sgml create
-	$wrksrc/xmlcatmgr -sc $wrksrc/catalog.sgml create
-	$wrksrc/xmlcatmgr -sc $wrksrc/catalog.etc.sgml add CATALOG      \
-		/usr/share/sgml/catalog
+	${_xmlcatmgr} -sc catalog.etc.sgml create
+	${_xmlcatmgr} -sc catalog.sgml create
+	${_xmlcatmgr} -sc catalog.etc.sgml add CATALOG /usr/share/sgml/catalog
 	echo "=> Creating XML catalogs..."
-	$wrksrc/xmlcatmgr -c $wrksrc/catalog.etc.xml create
-	$wrksrc/xmlcatmgr -c $wrksrc/catalog.xml create
-	$wrksrc/xmlcatmgr -c $wrksrc/catalog.etc.xml add nextCatalog    \
-		/usr/share/xml/catalog
+	${_xmlcatmgr} -c catalog.etc.xml create
+	${_xmlcatmgr} -c catalog.xml create
+	${_xmlcatmgr} -c catalog.etc.xml add nextCatalog /usr/share/xml/catalog
 }
 
 post_install() {
 	# Install the XML/SGML catalog files.
 	echo "=> Installing XML/SGML catalogs."
 	chmod 644 $wrksrc/catalog.*
-	install -D -m644 $wrksrc/catalog.sgml ${DESTDIR}/usr/share/sgml/catalog
-	install -D -m644 $wrksrc/catalog.etc.sgml ${DESTDIR}/etc/sgml/catalog
-	install -D -m644 $wrksrc/catalog.xml ${DESTDIR}/usr/share/xml/catalog
-	install -D -m644 $wrksrc/catalog.etc.xml ${DESTDIR}/etc/xml/catalog
+	install -Dm644 catalog.sgml ${DESTDIR}/usr/share/sgml/catalog
+	install -Dm644 catalog.etc.sgml ${DESTDIR}/etc/sgml/catalog
+	install -Dm644 catalog.xml ${DESTDIR}/usr/share/xml/catalog
+	install -Dm644 catalog.etc.xml ${DESTDIR}/etc/xml/catalog
 }