diff --git a/templates/libgcrypt-devel b/templates/libgcrypt-devel
new file mode 120000
index 00000000000..2d59ed19746
--- /dev/null
+++ b/templates/libgcrypt-devel
@@ -0,0 +1 @@
+libgcrypt
\ No newline at end of file
diff --git a/templates/libgcrypt/depends b/templates/libgcrypt/depends
new file mode 100644
index 00000000000..1e225b0efc9
--- /dev/null
+++ b/templates/libgcrypt/depends
@@ -0,0 +1,2 @@
+abi_depends=1.4.4
+api_depends=${abi_depends}
diff --git a/templates/libgcrypt/devel.template b/templates/libgcrypt/devel.template
new file mode 100644
index 00000000000..0eaf1afd9b7
--- /dev/null
+++ b/templates/libgcrypt/devel.template
@@ -0,0 +1,19 @@
+# Template file for 'libgrypt-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libgcrypt
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/bin
+	mkdir -p ${DESTDIR}/usr/lib
+
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}
diff --git a/templates/libgcrypt/template b/templates/libgcrypt/template
index fe949baa659..dac22bf852d 100644
--- a/templates/libgcrypt/template
+++ b/templates/libgcrypt/template
@@ -1,13 +1,12 @@
 # Template build file for 'libgcrypt'.
 pkgname=libgcrypt
-version=1.4.3
-distfiles="
-ftp://ftp.gnupg.org/gcrypt/libgcrypt/$pkgname-$version.tar.bz2"
+sourcepkg=$pkgname
+version=1.4.4
+distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="GNU cryptographic library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=5c66365e23798289fedcd9ea837cb887fa610ff4
+checksum=3212b88080cf8fa006164d38fc176fafa5c29591c8384f284ab880db0dbf306f
 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
@@ -15,3 +14,7 @@ long_desc="
  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="devel"
+Add_dependency full glibc
+Add_dependency full libgpg-error