diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile
index 86ec6ba0016..fac701383c3 100644
--- a/geo/qgis/Makefile
+++ b/geo/qgis/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.67 2017/05/31 08:08:16 espie Exp $
+# $OpenBSD: Makefile,v 1.68 2017/05/31 11:49:28 landry Exp $
 
 COMMENT =	desktop geographical information system
 
-DISTNAME =	qgis-2.18.8
+DISTNAME =	qgis-2.18.9
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	geo x11
 
 SHARED_LIBS =	qgis_core	17.0 \
 		qgis_app	5.0 \
-		qgis_gui	15.1 \
-		qgis_analysis	7.0 \
+		qgis_gui	16.0 \
+		qgis_analysis	8.0 \
 		qgis_server	5.0 \
 		qgispython	5.0 \
 		qgis_networkanalysis 2.0
diff --git a/geo/qgis/distinfo b/geo/qgis/distinfo
index 7d7fd03ad98..17bb2fd0755 100644
--- a/geo/qgis/distinfo
+++ b/geo/qgis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qgis-2.18.8.tar.bz2) = H2FJQD3ul0Aybnt811Yxcj7wl+y1NhOocPIynrqHWnE=
-SIZE (qgis-2.18.8.tar.bz2) = 84422466
+SHA256 (qgis-2.18.9.tar.bz2) = qSKvDks7z455DX/FB1K8lncav8LQkzZcsyYLRcJyJaE=
+SIZE (qgis-2.18.9.tar.bz2) = 84453524
diff --git a/geo/qgis/patches/patch-src_app_qgisapp_cpp b/geo/qgis/patches/patch-src_app_qgisapp_cpp
index a28d26ffe3d..486726ae03a 100644
--- a/geo/qgis/patches/patch-src_app_qgisapp_cpp
+++ b/geo/qgis/patches/patch-src_app_qgisapp_cpp
@@ -1,8 +1,6 @@
-$OpenBSD: patch-src_app_qgisapp_cpp,v 1.18 2017/05/23 09:16:29 landry Exp $
+$OpenBSD: patch-src_app_qgisapp_cpp,v 1.19 2017/05/31 11:49:28 landry Exp $
 Fix paths to docs
 
-Last chunk:
-https://github.com/qgis/QGIS/commit/af8fb04f396b8dce8eaae1d939fbe371ba05e6fb
 Index: src/app/qgisapp.cpp
 --- src/app/qgisapp.cpp.orig
 +++ src/app/qgisapp.cpp
@@ -15,7 +13,7 @@ Index: src/app/qgisapp.cpp
  
    connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
    connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
-@@ -9162,7 +9162,7 @@ void QgisApp::helpContents()
+@@ -9160,7 +9160,7 @@ void QgisApp::helpContents()
  
  void QgisApp::apiDocumentation()
  {
@@ -24,7 +22,7 @@ Index: src/app/qgisapp.cpp
    {
      openURL( "api/index.html" );
    }
-@@ -9191,7 +9191,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
+@@ -9189,7 +9189,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
    // open help in user browser
    if ( useQgisDocDirectory )
    {
@@ -33,12 +31,3 @@ Index: src/app/qgisapp.cpp
    }
  #ifdef Q_OS_MACX
    /* Use Mac OS X Launch Services which uses the user's default browser
-@@ -9315,7 +9315,7 @@ QgsVectorLayer* QgisApp::addVectorLayer( const QString
-       Q_ASSERT( elements.size() >= 4 );
-       if ( layer->name() != elements.at( 1 ) )
-       {
--        layer->setName( QStringLiteral( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );
-+        layer->setName( QString( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );
-       }
- 
-       myList << layer;
diff --git a/geo/qgis/pkg/PLIST b/geo/qgis/pkg/PLIST
index f335dd0f9d0..7bb60e9c232 100644
--- a/geo/qgis/pkg/PLIST
+++ b/geo/qgis/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.28 2017/05/23 09:16:29 landry Exp $
+@comment $OpenBSD: PLIST,v 1.29 2017/05/31 11:49:28 landry Exp $
 @bin bin/qbrowser
 @bin bin/qgis
 @bin bin/qgis_bench
@@ -782,7 +782,6 @@ lib/qgis/plugins/libzonalstatisticsplugin.so
 @bin lib/qgis/qgis_help
 @man man/man1/qbrowser.1
 @man man/man1/qgis.1
-share/applications/
 share/applications/qgis.desktop
 share/doc/qgis/
 share/doc/qgis/AUTHORS