diff --git a/srcpkgs/nautilus-devel b/srcpkgs/nautilus-devel
new file mode 120000
index 0000000000..9f0175d681
--- /dev/null
+++ b/srcpkgs/nautilus-devel
@@ -0,0 +1 @@
+nautilus
\ No newline at end of file
diff --git a/srcpkgs/nautilus/depends b/srcpkgs/nautilus/depends
new file mode 100644
index 0000000000..071d27b792
--- /dev/null
+++ b/srcpkgs/nautilus/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.30.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/nautilus/nautilus-devel.template b/srcpkgs/nautilus/nautilus-devel.template
new file mode 100644
index 0000000000..f56775a8d6
--- /dev/null
+++ b/srcpkgs/nautilus/nautilus-devel.template
@@ -0,0 +1,40 @@
+# Template file for 'nautilus-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run intltool
+Add_dependency run glib-devel
+Add_dependency run atk-devel
+Add_dependency run pango-devel
+Add_dependency run cairo-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run libSM-devel
+Add_dependency run libICE-devel
+Add_dependency run libXrender-devel
+Add_dependency run libXext-devel
+Add_dependency run gtk+-devel
+Add_dependency run startup-notification-devel
+Add_dependency run libunique-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run dbus-devel
+Add_dependency run libxml2-devel
+Add_dependency run libX11-devel
+Add_dependency run libexif-devel
+Add_dependency run exempi-devel
+Add_dependency run GConf-devel
+Add_dependency run gnome-desktop-devel
+Add_dependency run nautilus
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
new file mode 100644
index 0000000000..fa795364d6
--- /dev/null
+++ b/srcpkgs/nautilus/template
@@ -0,0 +1,70 @@
+# Template file for 'nautilus'
+pkgname=nautilus
+version=2.30.0
+distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var --disable-schemas-install
+--with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-update-mimedb"
+short_desc="The GNOME shell and file manager"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=01ecbc4b8b9a0ac726194eb81d3de7080ee52d885eb1898692aa951b093731a5
+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."
+
+triggers="mimedb"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+gconf_schemas="apps_nautilus_preferences.schemas"
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libXrender
+Add_dependency run libXext
+Add_dependency run gtk+
+Add_dependency run startup-notification
+Add_dependency run libunique
+Add_dependency run dbus-glib
+Add_dependency run dbus-libs
+Add_dependency run libxml2
+Add_dependency run libX11
+Add_dependency run libexif
+Add_dependency run exempi
+Add_dependency run GConf
+Add_dependency run gnome-desktop
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build atk-devel
+Add_dependency build pango-devel
+Add_dependency build cairo-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build libXrender-devel
+Add_dependency build libXext-devel
+Add_dependency build gtk+-devel
+Add_dependency build startup-notification-devel
+Add_dependency build libunique-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build dbus-devel
+Add_dependency build libxml2-devel
+Add_dependency build libX11-devel
+Add_dependency build libexif-devel
+Add_dependency build exempi-devel
+Add_dependency build GConf-devel
+Add_dependency build gnome-desktop-devel
+
+Add_dependency full gvfs
+Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index ed7146c081..a0c4d90289 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -598,3 +598,4 @@ libgphoto2.so			libgphoto2		libgphoto2-devel
 libgphoto2_port.so		libgphoto2		libgphoto2-devel
 libgvfscommon.so		gvfs			gvfs-devel
 libgvfscommon-dnssd.so		gvfs			gvfs-devel
+libnautilus-extension.so	nautilus		nautilus-devel