diff --git a/srcpkgs/libgcrypt/libgcrypt-devel.template b/srcpkgs/libgcrypt/libgcrypt-devel.template
index aa72f2386a2..1d406ca31be 100644
--- a/srcpkgs/libgcrypt/libgcrypt-devel.template
+++ b/srcpkgs/libgcrypt/libgcrypt-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libgrypt-devel'.
 #
-depends="libgpg-error-devel libgcrypt"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
+depends="libgpg-error-devel libgcrypt>=${version}"
+short_desc="${short_desc} -- development files"
+noarch=yes
 
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{bin,lib}
-
-	mv ${SRCPKGDESTDIR}/usr/{bin,include,share} ${DESTDIR}/usr
+do_install() {
+	vmove usr/bin/libgcrypt-config usr/bin
+	vmove usr/include usr
+	vmove usr/share usr
 }
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 76217a233f3..a4bd46b2ea5 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,19 +1,14 @@
 # Template build file for 'libgcrypt'.
 pkgname=libgcrypt
 version=1.5.0
-distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-revision=2
+configure_args="--disable-static"
+subpackages="$pkgname-devel"
 makedepends="libgpg-error-devel"
 short_desc="GNU cryptographic library"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.gnupg.org"
+license="LGPL-2.1"
+distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
 checksum=4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa
-long_desc="
- This is a general purpose cryptographic library based on the code from GnuPG.
- It provides functions for all cryptograhic building blocks: symmetric ciphers
- (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash algorithms (MD4, MD5,
- RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all hash algorithms), public key
- algorithms (RSA, ElGamal, DSA), large integer functions, random numbers and a
- lot of supporting functions."
-
-subpackages="$pkgname-devel"