diff --git a/srcpkgs/libnautilus b/srcpkgs/libnautilus
new file mode 120000
index 00000000000..9f0175d681c
--- /dev/null
+++ b/srcpkgs/libnautilus
@@ -0,0 +1 @@
+nautilus
\ No newline at end of file
diff --git a/srcpkgs/nautilus/depends b/srcpkgs/nautilus/depends
index 6e8d7e9a547..214cb4e13b8 100644
--- a/srcpkgs/nautilus/depends
+++ b/srcpkgs/nautilus/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.91.90"
+abi_depends=">=3.2.1"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/nautilus/libnautilus.template b/srcpkgs/nautilus/libnautilus.template
new file mode 100644
index 00000000000..a4872a51c45
--- /dev/null
+++ b/srcpkgs/nautilus/libnautilus.template
@@ -0,0 +1,23 @@
+# Template file for 'libnautilus'.
+#
+short_desc="${sourcepkg} - shared libraries"
+long_desc="${long_desc}
+
+ This package contains the shared libraries."
+
+replaces="nautilus<3.2.1"
+
+Add_dependency run glibc
+Add_dependency run gtk+3
+Add_dependency run atk
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+
+do_install()
+{
+	vmove "usr/lib/*.so*" usr/lib
+}
diff --git a/srcpkgs/nautilus/nautilus-devel.template b/srcpkgs/nautilus/nautilus-devel.template
index dda6520c7b5..a34a5c4572f 100644
--- a/srcpkgs/nautilus/nautilus-devel.template
+++ b/srcpkgs/nautilus/nautilus-devel.template
@@ -5,15 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run gtk+3-devel
-Add_dependency run libnotify-devel
-Add_dependency run libexif-devel
-Add_dependency run exempi-devel
-Add_dependency run libxml2-devel
-Add_dependency run gnome-desktop-devel
-Add_dependency run nautilus
+Add_dependency run libnautilus
 
 do_install()
 {
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 354acfd1c42..5f4f10d257c 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,39 +1,35 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.2.0
-revision=1
+version=3.2.1
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
-configure_args="--disable-update-mimedb
+configure_args="--disable-update-mimedb --disable-tracker
 --disable-schemas-compile --disable-nst-extension --disable-debug"
 short_desc="The GNOME file manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0eefea717d0b8fa360a50c493875cd146de05cc61b67b426d770ab5ba57541cd
+checksum=c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154
 long_desc="
  Nautilus is the official file manager for the GNOME desktop. It is
  designed to be primarly a file manager, but there is support for web and
  file viewing too."
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
+subpackages="lib${pkgname} ${pkgname}-devel"
 
 Add_dependency run glibc
-Add_dependency run atk
-Add_dependency run glib
-Add_dependency run pango
-Add_dependency run gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run cairo
-Add_dependency run freetype
-Add_dependency run fontconfig
-Add_dependency run libX11
 Add_dependency run gtk+3
+Add_dependency run gnome-desktop
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run cairo
+Add_dependency run libX11
 Add_dependency run libnotify
+Add_dependency run gdk-pixbuf
+Add_dependency run glib
 Add_dependency run libexif
 Add_dependency run exempi
 Add_dependency run libxml2
-Add_dependency run gnome-desktop
-Add_dependency run libtracker
+Add_dependency run libnautilus
 
 Add_dependency run hicolor-icon-theme
 Add_dependency run desktop-file-utils
@@ -47,6 +43,5 @@ Add_dependency build libexif-devel
 Add_dependency build exempi-devel
 Add_dependency build libxml2-devel
 Add_dependency build gnome-desktop-devel
-Add_dependency build tracker-devel
 
 Add_dependency full gsettings-desktop-schemas
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 574bfa1b56e..68d8789b453 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -611,7 +611,7 @@ libgphoto2.so.2			libgphoto2		libgphoto2-devel
 libgphoto2_port.so.0		libgphoto2		libgphoto2-devel
 libgvfscommon.so.0		gvfs			gvfs-devel
 libgvfscommon-dnssd.so.0	gvfs			gvfs-devel
-libnautilus-extension.so.1	nautilus		nautilus-devel
+libnautilus-extension.so.1	libnautilus		nautilus-devel
 libgdict-1.0.so.6		gnome-utils		gnome-utils-devel
 libgnomeui-2.so.0		libgnomeui		libgnomeui-devel
 libmpc.so.2.0.0			mpc			mpc-devel