diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
new file mode 100644
index 000000000..f2b24a28e
--- /dev/null
+++ b/core/libgcrypt/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - Note: this package needs to be fully re-checked beyond version 1.6.0
+#
+#  - switch to git repo to pull in missing ARM assembly files and fixes
+#  - switch ifdef's in cipher files to actually respect --disable-neon-support
+#  - disable intel's RNG
+#  - drop docs from building in the makefile, all sorts of busted in git
+
+pkgname=libgcrypt
+pkgver=1.6.0
+pkgrel=1
+pkgdesc="General purpose cryptographic library based on the code from GnuPG"
+arch=(i686 x86_64)
+url="http://www.gnupg.org"
+license=('LGPL')
+depends=('libgpg-error>=1.10-2')
+makedepends=('git')
+options=('!emptydirs')
+install=$pkgname.install
+source=("${pkgname}-${pkgver}::git://git.gnupg.org/libgcrypt.git#branch=LIBGCRYPT-1-6-BRANCH")
+sha1sums=('SKIP')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  sed -i 's/HAVE_GCC_INLINE_ASM_NEON/ENABLE_NEON_SUPPORT/g' cipher/*
+  sed -i 's/ doc / /g' Makefile.am
+  autoreconf -fi
+
+  ./configure --prefix=/usr \
+	--disable-static \
+	--disable-padlock-support \
+	--disable-drng-support \
+	--disable-neon-support
+  make
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/core/libgcrypt/libgcrypt.install b/core/libgcrypt/libgcrypt.install
new file mode 100644
index 000000000..79b878201
--- /dev/null
+++ b/core/libgcrypt/libgcrypt.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(gcrypt.info.gz gcrypt.info-1.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}