diff --git a/x11/gnome/nautilus/Makefile b/x11/gnome/nautilus/Makefile
index eecd5bed485..4e45f60dc3a 100644
--- a/x11/gnome/nautilus/Makefile
+++ b/x11/gnome/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.116 2013/03/11 11:46:11 espie Exp $
+# $OpenBSD: Makefile,v 1.117 2013/03/29 15:13:28 jasper Exp $
 
 COMMENT=		GNOME file manager
 
@@ -15,7 +15,7 @@ COMMENT=		GNOME file manager
 # x11/gnome/tracker
 
 GNOME_PROJECT=		nautilus
-GNOME_VERSION=		3.6.3
+GNOME_VERSION=		3.8.0
 
 SHARED_LIBS +=  nautilus-extension   3.0      # 5.0
 
@@ -26,16 +26,15 @@ HOMEPAGE=		http://www.gnome.org/projects/nautilus/
 # GPLv2 - LGPLv2 - GFPLv1.1
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
-WANTLIB += c cairo cairo-gobject drm exempi exif expat
+WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
+WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
+WANTLIB += c cairo cairo-gobject dbus-1 exempi exif expat ffi
 WANTLIB += fontconfig freetype gailutil-3 gdk-3 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 gobject-2.0
-WANTLIB += gthread-2.0 gtk-3 m notify pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
-WANTLIB += xcb xcb-render xcb-shm xml2 z ffi stdc++
-WANTLIB += ICE SM atk-bridge-2.0 atspi dbus-1 harfbuzz icudata
-WANTLIB += icule icuuc xkbfile
+WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz icudata icule
+WANTLIB += icuuc m notify pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
+WANTLIB += xcb-shm xkbfile xml2 z
 
 MODULES=		devel/gettext \
 			x11/gnome \
@@ -74,7 +73,7 @@ MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/nautilus
 
 # needs 'org.gnome.nautilus.preferences'
-TEST_DEPENDS=	${BASE_PKGPATH}
+TEST_DEPENDS=		${BASE_PKGPATH}
 TEST_IS_INTERACTIVE=	x11
 
 post-install:
diff --git a/x11/gnome/nautilus/distinfo b/x11/gnome/nautilus/distinfo
index 04dd930bf9e..30b56f085a1 100644
--- a/x11/gnome/nautilus/distinfo
+++ b/x11/gnome/nautilus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome/nautilus-3.6.3.tar.xz) = 0nICd1TOhZGVmuhU/GtfQ+7krzHk7s8G3nJ6zr4O5Gw=
-SIZE (gnome/nautilus-3.6.3.tar.xz) = 4959376
+SHA256 (gnome/nautilus-3.8.0.tar.xz) = ybQJbrZABjB7/VVkADMZGrN5yI7oZS6CAxGKPKmGThE=
+SIZE (gnome/nautilus-3.8.0.tar.xz) = 4979332
diff --git a/x11/gnome/nautilus/pkg/PFRAG.shared b/x11/gnome/nautilus/pkg/PFRAG.shared
deleted file mode 100644
index a96a45ed483..00000000000
--- a/x11/gnome/nautilus/pkg/PFRAG.shared
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.9 2011/09/12 07:28:53 jasper Exp $
-@lib lib/libnautilus-extension.so.${LIBnautilus-extension_VERSION}
-lib/nautilus/extensions-3.0/libnautilus-sendto.so
diff --git a/x11/gnome/nautilus/pkg/PLIST b/x11/gnome/nautilus/pkg/PLIST
index f13fb79d962..9e5e760ccb6 100644
--- a/x11/gnome/nautilus/pkg/PLIST
+++ b/x11/gnome/nautilus/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.41 2012/10/15 15:47:38 ajacoutot Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.42 2013/03/29 15:13:29 jasper Exp $
 @bin bin/nautilus
 @bin bin/nautilus-autorun-software
 @bin bin/nautilus-connect-server
@@ -19,16 +18,17 @@ include/nautilus/libnautilus-extension/nautilus-property-page.h
 lib/girepository-1.0/Nautilus-3.0.typelib
 lib/libnautilus-extension.a
 lib/libnautilus-extension.la
+@lib lib/libnautilus-extension.so.${LIBnautilus-extension_VERSION}
 lib/nautilus/
 lib/nautilus/extensions-3.0/
 lib/pkgconfig/
 lib/pkgconfig/libnautilus-extension.pc
 @bin libexec/nautilus-convert-metadata
-@bin libexec/nautilus-shell-search-provider
 @man man/man1/nautilus-connect-server.1
 @man man/man1/nautilus.1
 share/GConf/gsettings/nautilus.convert
 share/applications/nautilus-autorun-software.desktop
+share/applications/nautilus-classic.desktop
 share/applications/nautilus-connect-server.desktop
 share/applications/nautilus.desktop
 share/dbus-1/services/org.freedesktop.FileManager1.service
@@ -70,8 +70,6 @@ share/gtk-doc/html/libnautilus-extension/style.css
 share/gtk-doc/html/libnautilus-extension/up.png
 share/locale/af/LC_MESSAGES/nautilus.mo
 share/locale/am/LC_MESSAGES/nautilus.mo
-share/locale/an/
-share/locale/an/LC_MESSAGES/
 share/locale/an/LC_MESSAGES/nautilus.mo
 share/locale/ar/LC_MESSAGES/nautilus.mo
 share/locale/as/LC_MESSAGES/nautilus.mo
@@ -197,6 +195,7 @@ share/locale/sr@latin/LC_MESSAGES/nautilus.mo
 share/locale/sv/LC_MESSAGES/nautilus.mo
 share/locale/ta/LC_MESSAGES/nautilus.mo
 share/locale/te/LC_MESSAGES/nautilus.mo
+share/locale/tg/LC_MESSAGES/nautilus.mo
 share/locale/th/LC_MESSAGES/nautilus.mo
 share/locale/tk/
 share/locale/tk/LC_MESSAGES/