diff --git a/x11/gnome/baobab/Makefile b/x11/gnome/baobab/Makefile
index 9e6ee35720f..b5bba2e157b 100644
--- a/x11/gnome/baobab/Makefile
+++ b/x11/gnome/baobab/Makefile
@@ -1,26 +1,24 @@
-# $OpenBSD: Makefile,v 1.36 2015/07/18 22:29:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2015/10/05 05:59:51 ajacoutot Exp $
 
 COMMENT=		directory tree analyzer for GNOME
 
 GNOME_PROJECT=		baobab
-GNOME_VERSION=		3.16.1
+GNOME_VERSION=		3.18.0
 
 # GPLv2 - GFDLv1.1
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3 m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z
+WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 m pango-1.0 pangocairo-1.0
+WANTLIB += pthread
 
 LIB_DEPENDS=		x11/gtk+3
 
-RUN_DEPENDS=		x11/gnome/gvfs
-
 MODULES=		devel/dconf \
 			devel/gettext \
 			x11/gnome
 
-MODGNOME_TOOLS += desktop-file-utils gobject-introspection vala yelp
+MODGNOME_TOOLS += desktop-file-utils gobject-introspection yelp
 MODGNOME_TOOLS += gtk-update-icon-cache
 
 pre-configure:
diff --git a/x11/gnome/baobab/distinfo b/x11/gnome/baobab/distinfo
index 93ae2a438d6..f0452d7907a 100644
--- a/x11/gnome/baobab/distinfo
+++ b/x11/gnome/baobab/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome/baobab-3.16.1.tar.xz) = H+QEM9863aC8xNCm7cK8JQGIh5jX6DNq1R1EPJofzvI=
-SIZE (gnome/baobab-3.16.1.tar.xz) = 880192
+SHA256 (gnome/baobab-3.18.0.tar.xz) = dZJMU90OlNl8Lw7DAnD6P/xZrfq34hqsPtnGwIh2C1o=
+SIZE (gnome/baobab-3.18.0.tar.xz) = 879928
diff --git a/x11/gnome/baobab/pkg/PLIST b/x11/gnome/baobab/pkg/PLIST
index a8cdd38bd93..04bc4a5b91d 100644
--- a/x11/gnome/baobab/pkg/PLIST
+++ b/x11/gnome/baobab/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2015/04/14 05:54:23 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.16 2015/10/05 05:59:51 ajacoutot Exp $
 @conflict gnome-utils-*
 @bin bin/baobab
 @man man/man1/baobab.1
@@ -306,8 +306,6 @@ share/locale/eu/LC_MESSAGES/baobab.mo
 share/locale/fa/LC_MESSAGES/baobab.mo
 share/locale/fi/LC_MESSAGES/baobab.mo
 share/locale/fr/LC_MESSAGES/baobab.mo
-share/locale/fur/
-share/locale/fur/LC_MESSAGES/
 share/locale/fur/LC_MESSAGES/baobab.mo
 share/locale/ga/LC_MESSAGES/baobab.mo
 share/locale/gd/LC_MESSAGES/baobab.mo
@@ -318,6 +316,7 @@ share/locale/hi/LC_MESSAGES/baobab.mo
 share/locale/hr/LC_MESSAGES/baobab.mo
 share/locale/hu/LC_MESSAGES/baobab.mo
 share/locale/id/LC_MESSAGES/baobab.mo
+share/locale/is/LC_MESSAGES/baobab.mo
 share/locale/it/LC_MESSAGES/baobab.mo
 share/locale/ja/LC_MESSAGES/baobab.mo
 share/locale/ka/LC_MESSAGES/baobab.mo