diff --git a/srcpkgs/neon/neon-devel.template b/srcpkgs/neon/neon-devel.template
index 685fc7205ef..a6491221a74 100644
--- a/srcpkgs/neon/neon-devel.template
+++ b/srcpkgs/neon/neon-devel.template
@@ -1,17 +1,15 @@
 # Template file for 'neon-devel'.
 #
-depends="expat-devel openssl-devel neon"
+noarch=yes
+depends="expat-devel openssl-devel neon>=${version}"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/{doc,man} ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ac58ca6602e..a30ff07e04f 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,16 +1,19 @@
 # Template file for 'neon'
 pkgname=neon
-version=0.29.5
-revision=3
-distfiles="http://www.webdav.org/neon/neon-$version.tar.gz"
+version=0.29.6
+revision=1
+subpackages="neon-devel"
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
---with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
 depends="ca-certificates"
-makedepends="zlib-devel expat-devel openssl-devel mit-krb5-devel e2fsprogs-devel libproxy-devel"
+makedepends="expat-devel openssl-devel>=1.0.1 mit-krb5-devel e2fsprogs-devel libproxy-devel"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=dea3c52b9f3f915651c6279c76758acf7c427727e8b9b0130f8b138f24012290
+homepage="http://www.webdav.org/neon/"
+license="LGPL-2.1"
+distfiles="http://www.webdav.org/neon/neon-$version.tar.gz"
+checksum=9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43
 long_desc="
  Features:
 
@@ -28,6 +31,3 @@ long_desc="
     simplifying handling XML HTTP response bodies
   * WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify
     property manipulation."
-
-subpackages="neon-devel"
-