diff --git a/srcpkgs/ntfs-3g/ntfs-3g-devel.template b/srcpkgs/ntfs-3g/ntfs-3g-devel.template
index b1fe2b188d1..d481b9a516d 100644
--- a/srcpkgs/ntfs-3g/ntfs-3g-devel.template
+++ b/srcpkgs/ntfs-3g/ntfs-3g-devel.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+replaces="ntfsprogs-devel>=0"
 Add_dependency run fuse-devel
 Add_dependency run ntfs-3g
 
diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template
index 262a3c714ab..dcd1e0efcf2 100644
--- a/srcpkgs/ntfs-3g/template
+++ b/srcpkgs/ntfs-3g/template
@@ -1,13 +1,13 @@
 # Template file for 'ntfs-3g'
 pkgname=ntfs-3g
-version=2011.1.15
-revision=1
-distfiles="http://www.tuxera.com/opensource/$pkgname-$version.tgz"
+version=2011.4.12
+wrksrc=${pkgname}_ntfsprogs-${version}
+distfiles="http://www.tuxera.com/opensource/${pkgname}_ntfsprogs-${version}.tgz"
 build_style=gnu_configure
 configure_args="--bindir=/bin --disable-static --with-fuse=external"
 short_desc="Stable Read/Write NTFS Driver in userspace"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=d8a101002cd4cc493f5da5efd02f1860c32f46ed14a99e1356c6d376d39a0a6b
+checksum=aa8c747f0bfe819b2387b05e12db8d35e4ac96dcb2432873a0b939e248b2ee05
 long_desc="
  The NTFS-3G driver is a freely and commercially available and supported
  read/write NTFS driver for Linux, Mac OS X, FreeBSD, NetBSD, OpenSolaris,
@@ -15,7 +15,12 @@ long_desc="
  of the Windows XP, Windows Server 2003, Windows 2000, Windows Vista, Windows
  Server 2008 and Windows 7 file systems."
 
+replaces="ntfsprogs>=0"
 subpackages="$pkgname-devel"
+
 Add_dependency run glibc
+Add_dependency run libuuid
 Add_dependency run fuse
+
+Add_dependency build libuuid-devel
 Add_dependency build fuse-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index ce3c4a80412..e4c5583fafe 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -457,7 +457,7 @@ libgvplugin_rsvg.so		graphviz
 libgvplugin_gtk.so		graphviz
 libparted.so			libparted		libparted-devel
 libopenobex.so			libopenobex		libopenobex-devel
-libntfs-3g.so.80		ntfs-3g			ntfs-3g-devel
+libntfs-3g.so.81		ntfs-3g			ntfs-3g-devel
 libruby.so.1			ruby			ruby-devel
 libfsimage.so.1			xen			xen-devel
 libxenctrl.so.4			xen			xen-devel