diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template
index fc667d7d7d..5dad39d6f9 100644
--- a/srcpkgs/tinyxml/template
+++ b/srcpkgs/tinyxml/template
@@ -1,7 +1,7 @@
 # Template file for 'tinyxml'
 pkgname=tinyxml
 version=2.6.2
-revision=2
+revision=3
 subpackages="${pkgname}-devel"
 short_desc="A simple, small, C++ XML parser that can be easily integrated into other programs"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -19,17 +19,17 @@ do_build() {
 		 -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile
 
 	make ${makejobs}
-	g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.${version} \
-		-Wl,-soname,lib${pkgname}.so.0 $(ls *.o | grep -v xmltest)
+	g++ -fPIC ${CXXFLAGS} -shared -o lib${sourcepkg}.so.0.${version} \
+		-Wl,-soname,lib${sourcepkg}.so.0 $(ls *.o | grep -v xmltest)
 }
 
 do_install() {
 	install -dm 0755 ${DESTDIR}/usr/{lib,include}
-	install -m0755 lib${pkgname}.so.0.${version} ${DESTDIR}/usr/lib
-	install -m0644 ${pkgname}.h tinystr.h ${DESTDIR}/usr/include
+	install -m0755 lib${sourcepkg}.so.0.${version} ${DESTDIR}/usr/lib
+	install -m0644 ${sourcepkg}.h tinystr.h ${DESTDIR}/usr/include
 
 	(cd ${DESTDIR}/usr/lib
-	 ln -s lib${pkgname}.so.0.${version} lib${pkgname}.so.0
-	 ln -s lib${pkgname}.so.0.${version} lib${pkgname}.so
+	 ln -s lib${sourcepkg}.so.0.${version} lib${sourcepkg}.so.0
+	 ln -s lib${sourcepkg}.so.0.${version} lib${sourcepkg}.so
 	)
 }
diff --git a/srcpkgs/tinyxml/tinyxml-devel.template b/srcpkgs/tinyxml/tinyxml-devel.template
index 8eb82c1e55..1512bb9365 100644
--- a/srcpkgs/tinyxml/tinyxml-devel.template
+++ b/srcpkgs/tinyxml/tinyxml-devel.template
@@ -2,7 +2,6 @@
 #
 depends="${sourcepkg}>=${version}"
 short_desc="${short_desc} -- development files"
-noarch=yes
 
 do_install() {
 	vmove usr/include usr