diff --git a/common/shlibs b/common/shlibs
index ac40e160d3..d086e45448 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -970,3 +970,4 @@ libhubbub.so.0			libhubbub		libhubbub-devel
 libdom.so.0			libdom			libdom-devel
 liblutok.so.0			lutok			lutok-devel
 libmtdev.so.1			mtdev			mtdev-devel
+libcryptsetup.so.4		libcryptsetup		cryptsetup-devel
diff --git a/srcpkgs/cryptsetup-devel b/srcpkgs/cryptsetup-devel
new file mode 120000
index 0000000000..a46924c674
--- /dev/null
+++ b/srcpkgs/cryptsetup-devel
@@ -0,0 +1 @@
+cryptsetup
\ No newline at end of file
diff --git a/srcpkgs/cryptsetup/cryptsetup-devel.template b/srcpkgs/cryptsetup/cryptsetup-devel.template
new file mode 100644
index 0000000000..0a5602b16d
--- /dev/null
+++ b/srcpkgs/cryptsetup/cryptsetup-devel.template
@@ -0,0 +1,13 @@
+# Template file for 'cryptsetup-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains development files: headers, static libs, etc."
+
+Add_dependency run libcryptsetup ">=${version}"
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/cryptsetup/cryptsetup.rshlibs b/srcpkgs/cryptsetup/cryptsetup.rshlibs
new file mode 100644
index 0000000000..a52ea25720
--- /dev/null
+++ b/srcpkgs/cryptsetup/cryptsetup.rshlibs
@@ -0,0 +1,3 @@
+libc.so.6
+libpopt.so.0
+libcryptsetup.so.4
diff --git a/srcpkgs/cryptsetup/depends b/srcpkgs/cryptsetup/depends
new file mode 100644
index 0000000000..eaf929f4dc
--- /dev/null
+++ b/srcpkgs/cryptsetup/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.4.1"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/cryptsetup/libcryptsetup.rshlibs b/srcpkgs/cryptsetup/libcryptsetup.rshlibs
new file mode 100644
index 0000000000..4110a19c11
--- /dev/null
+++ b/srcpkgs/cryptsetup/libcryptsetup.rshlibs
@@ -0,0 +1,5 @@
+libuuid.so.1
+libdevmapper.so.1.02
+libgcrypt.so.11
+libgpg-error.so.0
+libc.so.6
diff --git a/srcpkgs/cryptsetup/libcryptsetup.template b/srcpkgs/cryptsetup/libcryptsetup.template
new file mode 100644
index 0000000000..f8f173964e
--- /dev/null
+++ b/srcpkgs/cryptsetup/libcryptsetup.template
@@ -0,0 +1,10 @@
+# Template file for 'libcryptsetup'.
+#
+short_desc="${sourcepkg} - runtime libraries"
+long_desc="${long_desc}
+
+ This package contains the runtime libraries."
+
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
+}
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
new file mode 100644
index 0000000000..b5fef6cbfe
--- /dev/null
+++ b/srcpkgs/cryptsetup/template
@@ -0,0 +1,28 @@
+# Template file for 'cryptsetup'
+pkgname=cryptsetup
+version=1.4.1
+homepage="http://code.google.com/p/cryptsetup"
+distfiles="https://cryptsetup.googlecode.com/files/$pkgname-$version.tar.bz2"
+build_style=gnu-configure
+short_desc="Setup virtual encryption devices under dm-crypt Linux"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-3"
+checksum=82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb
+long_desc="
+ Cryptsetup provides an interface for configuring encryption on block devices
+ (such as /home or swap partitions), using the Linux kernel device mapper target
+ dm-crypt. It features integrated Linux Unified Key Setup (LUKS) support.
+
+ Cryptsetup is backwards compatible with the on-disk format of cryptoloop, but
+ also supports more secure formats. This package includes support for automatically
+ configuring encrypted devices at boot time via the config file /etc/crypttab.
+ Additional features are cryptoroot support through initramfs-tools and several
+ supported ways to read a passphrase or key."
+
+subpackages="libcryptsetup cryptsetup-devel"
+
+Add_dependency build pkg-config
+Add_dependency build popt-devel
+Add_dependency build libuuid-devel
+Add_dependency build device-mapper-devel
+Add_dependency build libgcrypt-devel
diff --git a/srcpkgs/libcryptsetup b/srcpkgs/libcryptsetup
new file mode 120000
index 0000000000..a46924c674
--- /dev/null
+++ b/srcpkgs/libcryptsetup
@@ -0,0 +1 @@
+cryptsetup
\ No newline at end of file