diff --git a/common/shlibs b/common/shlibs
index e803c13f91..77a3c32638 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -975,3 +975,4 @@ libmtdev.so.1			mtdev			mtdev-devel
 libcryptsetup.so.4		libcryptsetup		cryptsetup-devel
 libgusb.so.2			libgusb			libgusb-devel
 libmash-0.1.so.0		mash			mash-devel
+libudisks2.so.0			udisks2			udisks2-devel
diff --git a/srcpkgs/udisks2-devel b/srcpkgs/udisks2-devel
new file mode 120000
index 0000000000..316cba4f3f
--- /dev/null
+++ b/srcpkgs/udisks2-devel
@@ -0,0 +1 @@
+udisks2
\ No newline at end of file
diff --git a/srcpkgs/udisks2/depends b/srcpkgs/udisks2/depends
new file mode 100644
index 0000000000..1ce20b8e28
--- /dev/null
+++ b/srcpkgs/udisks2/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.93.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template
new file mode 100644
index 0000000000..35bccfa8d0
--- /dev/null
+++ b/srcpkgs/udisks2/template
@@ -0,0 +1,38 @@
+# Template file for 'udisks2'
+pkgname=udisks2
+version=1.93.0
+wrksrc="udisks-${version}"
+distfiles="http://udisks.freedesktop.org/releases/udisks-$version.tar.bz2"
+build_style=gnu-configure
+configure_args="--disable-static --with-systemdsystemunitdir=/lib/systemd/system"
+short_desc="Disk Management Service"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.freedesktop.org/wiki/Software/udisks"
+license="GPL-2"
+checksum=e2264d06bbf5399d243b0f91628881fa1d95d1a512b2af26f5ab074caf6327d7
+long_desc="
+ The udisks project provides:
+
+    * a storage daemon that implements well-defined D-Bus interfaces that
+      can be used to query and manipulate storage devices.
+    * a command-line tool, udisks, that can be used to query and use the daemon 
+
+ The actions that a user can perform using udisks are restricted using
+ PolicyKit."
+
+subpackages="udisks2-devel"
+make_dirs="/var/lib/udisks2 0750 root root"
+
+Add_dependency run udev
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build libxslt
+Add_dependency build docbook-xsl
+Add_dependency build device-mapper-devel
+Add_dependency build liblvm2app-devel
+Add_dependency build libparted-devel
+Add_dependency build libatasmart-devel
+Add_dependency build polkit-devel
+Add_dependency build libgudev-devel
+Add_dependency build sg3_utils-devel
diff --git a/srcpkgs/udisks2/udisks2-devel.template b/srcpkgs/udisks2/udisks2-devel.template
new file mode 100644
index 0000000000..c1dfeff7ed
--- /dev/null
+++ b/srcpkgs/udisks2/udisks2-devel.template
@@ -0,0 +1,16 @@
+# Template file for 'udisks2-devel'.
+#
+short_desc="${sourcepkg} -- development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glib-devel
+Add_dependency run udisks2 ">=${version}"
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
+}
diff --git a/srcpkgs/udisks2/udisks2.rshlibs b/srcpkgs/udisks2/udisks2.rshlibs
new file mode 100644
index 0000000000..58c3f16c56
--- /dev/null
+++ b/srcpkgs/udisks2/udisks2.rshlibs
@@ -0,0 +1,9 @@
+libpthread.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libc.so.6
+libatasmart.so.4
+libpolkit-gobject-1.so.0
+libgio-2.0.so.0
+libgudev-1.0.so.0
+libpolkit-agent-1.so.0