diff --git a/srcpkgs/raptor/libraptor.rshlibs b/srcpkgs/raptor/libraptor.rshlibs
index 8d5fdd1adfe..876c8fa81ee 100644
--- a/srcpkgs/raptor/libraptor.rshlibs
+++ b/srcpkgs/raptor/libraptor.rshlibs
@@ -1,6 +1,4 @@
 libcurl.so.4
 libxslt.so.1
 libxml2.so.2
-libz.so.1
-libm.so.6
 libc.so.6
diff --git a/srcpkgs/raptor/raptor-devel.template b/srcpkgs/raptor/raptor-devel.template
index c27a6bd4f1c..420eae51b24 100644
--- a/srcpkgs/raptor/raptor-devel.template
+++ b/srcpkgs/raptor/raptor-devel.template
@@ -1,14 +1,13 @@
 # Template file for 'aubio-devel'.
 #
-depends="libxml2-devel zlib-devel libraptor"
+noarch=yes
+depends="libxml2-devel zlib-devel libraptor-${version}_${revision}"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
         vmove usr/include usr
         vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gtk-doc usr/share
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 788c5460338..e152c2edaf2 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -1,16 +1,17 @@
 # Template file for 'raptor'
 pkgname=raptor
 version=2.0.6
+revision=2
 wrksrc="raptor2-${version}"
-homepage="http://librdf.org/raptor"
-distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz"
+subpackages="lib${pkgname} ${pkgname}-devel"
 build_style=gnu-configure
 configure_args="--disable-static --with-yajl=no"
-makedepends="pkg-config libcurl-devel libxslt-devel"
-revision=1
+makedepends="pkg-config libcurl-devel libxml2-devel libxslt-devel"
 short_desc="Raptor RDF Syntax Library"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
+homepage="http://librdf.org/raptor"
+distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz"
 checksum=46831fbe5470d6ae22bde466fbb6ed281830116b6a427a617a73ff3e558d7aa4
 long_desc="
  Raptor is a free software / Open Source C library that provides a set of
@@ -21,6 +22,3 @@ long_desc="
  and microformats for HTML, XHTML and XML and RDFa. The serializing syntaxes
  are RDF/XML (regular, and abbreviated), Atom 1.0, GraphViz, JSON, N-Quads,
  N-Triples, RSS 1.0 and XMP."
-
-subpackages="lib${pkgname} ${pkgname}-devel"
-