diff --git a/srcpkgs/libmount b/srcpkgs/libmount
new file mode 120000
index 0000000000..4bc22946d3
--- /dev/null
+++ b/srcpkgs/libmount
@@ -0,0 +1 @@
+util-linux-ng
\ No newline at end of file
diff --git a/srcpkgs/libmount-devel b/srcpkgs/libmount-devel
new file mode 120000
index 0000000000..4bc22946d3
--- /dev/null
+++ b/srcpkgs/libmount-devel
@@ -0,0 +1 @@
+util-linux-ng
\ No newline at end of file
diff --git a/srcpkgs/util-linux-ng/libblkid-devel.template b/srcpkgs/util-linux-ng/libblkid-devel.template
index 5d2fc6a764..deabb08142 100644
--- a/srcpkgs/util-linux-ng/libblkid-devel.template
+++ b/srcpkgs/util-linux-ng/libblkid-devel.template
@@ -7,8 +7,6 @@ long_desc="
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run zlib-devel
 Add_dependency run libuuid-devel
 Add_dependency run libblkid
diff --git a/srcpkgs/util-linux-ng/libblkid.template b/srcpkgs/util-linux-ng/libblkid.template
index 48cd24962b..190f38288b 100644
--- a/srcpkgs/util-linux-ng/libblkid.template
+++ b/srcpkgs/util-linux-ng/libblkid.template
@@ -5,8 +5,6 @@ long_desc="
  The libblkid package contains a library to handle device identification
  and token extraction."
 
-revision=1
-
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run libuuid
diff --git a/srcpkgs/util-linux-ng/libmount-devel.template b/srcpkgs/util-linux-ng/libmount-devel.template
new file mode 100644
index 0000000000..e15947d924
--- /dev/null
+++ b/srcpkgs/util-linux-ng/libmount-devel.template
@@ -0,0 +1,22 @@
+# Template file for 'libmount-devel'.
+#
+short_desc="mount(8) library development files"
+long_desc="
+ This NEW LIBRARY is designed to be used in low-level utils like
+ mount(8) and /sbin/mount.<type> helpers as well as in some other
+ projects.
+ 
+ This packages contains files for development, static files, headers, etc."
+
+Add_dependency run glibc-devel
+Add_dependency run libblkid-devel
+Add_dependency run libuuid-devel
+Add_dependency run libmount
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include
+	mv ${SRCPKGDESTDIR}/usr/lib/libmount.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/*mount* ${DESTDIR}/usr/lib/pkgconfig
+	mv ${SRCPKGDESTDIR}/usr/include/mount ${DESTDIR}/usr/include
+}
diff --git a/srcpkgs/util-linux-ng/libmount.template b/srcpkgs/util-linux-ng/libmount.template
new file mode 100644
index 0000000000..8bf4fd5078
--- /dev/null
+++ b/srcpkgs/util-linux-ng/libmount.template
@@ -0,0 +1,18 @@
+# Template file for 'libmount'.
+#
+short_desc="A mount(8) library"
+long_desc="
+ This NEW LIBRARY is designed to be used in low-level utils like
+ mount(8) and /sbin/mount.<type> helpers as well as in some other
+ projects."
+
+Add_dependency run glibc
+Add_dependency run libblkid
+Add_dependency run libuuid
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/lib ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/lib/libmount.so* ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libmount.so ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/util-linux-ng/libuuid-devel.template b/srcpkgs/util-linux-ng/libuuid-devel.template
index 71b1aa650b..e27a3181bf 100644
--- a/srcpkgs/util-linux-ng/libuuid-devel.template
+++ b/srcpkgs/util-linux-ng/libuuid-devel.template
@@ -7,8 +7,6 @@ long_desc="
  
  This packages contains files for development, static files, headers, etc."
 
-revision=1
-
 Add_dependency run glibc-devel
 
 do_install()
diff --git a/srcpkgs/util-linux-ng/libuuid.template b/srcpkgs/util-linux-ng/libuuid.template
index fcdeab1436..4e0911b296 100644
--- a/srcpkgs/util-linux-ng/libuuid.template
+++ b/srcpkgs/util-linux-ng/libuuid.template
@@ -5,8 +5,6 @@ long_desc="
  libuuid generates and parses 128-bit universally unique id's (UUIDs).
  See RFC 4122 for more information."
 
-revision=1
- 
 Add_dependency run glibc
 
 do_install()
diff --git a/srcpkgs/util-linux-ng/template b/srcpkgs/util-linux-ng/template
index f7901208ba..a864628813 100644
--- a/srcpkgs/util-linux-ng/template
+++ b/srcpkgs/util-linux-ng/template
@@ -1,21 +1,21 @@
 # Template file for 'util-linux-ng'
 pkgname=util-linux-ng
-version=2.17.2
-revision=1
-distfiles="${KERNEL_SITE}/utils/$pkgname/v2.17/$pkgname-$version.tar.bz2"
+version=2.18
+distfiles="${KERNEL_SITE}/utils/$pkgname/v2.18/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-partx --enable-write --enable-libuuid
 --enable-libblkid --disable-fsck --disable-rpath --with-gnu-ld
 --disable-makeinstall-chown"
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f
+checksum=b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc
 long_desc="
  The util-linux-ng package contains miscellaneous utility programs. Among
  them are utilities for handling file systems, consoles, partitions,
  and messages."
 
-subpackages="libblkid libblkid-devel libuuid libuuid-devel"
+subpackages="libmount libmount-devel libblkid libblkid-devel
+libuuid libuuid-devel"
 # Required by /var/lib/hwclock
 keep_empty_dirs=yes
 
@@ -24,6 +24,7 @@ Add_dependency run coreutils
 Add_dependency run zlib
 Add_dependency run libuuid
 Add_dependency run libblkid
+Add_dependency run libmount
 Add_dependency run ncursesw
 Add_dependency run shadow
 Add_dependency build pkg-config