diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 4007379..6cc5ba5 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -9,21 +9,24 @@ pkgver=2.6.1
 pkgrel=1
 arch=('x86_64')
 license=('GPL2')
-makedepends=('c-ares' 'geoip' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
+makedepends=('c-ares' 'libmaxminddb' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
              'gnutls' 'portaudio' 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
 options=('!emptydirs')
 url='https://www.wireshark.org/'
 source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz
         wireshark.sysusers
-        do_not_use_svn_version.patch)
+        do_not_use_svn_version.patch
+        b8e8aa87f43c12ad564426b3359f593305cd45a1.patch)
 sha256sums=('ab6e5bbc3464c956347b8671ce8397950ad5daff3bf9964c967d495f4ddbcd88'
             'df07748152443c7d727bd51cd57af950c345b7141986b4f0e476cd6aa3623ac4'
-            '3981bb46f592e319f9c679c5e215ae0af828044a3b64d49d2cf0305ecacf4691')
+            '3981bb46f592e319f9c679c5e215ae0af828044a3b64d49d2cf0305ecacf4691'
+            '210fa7a5a511949671726a7d7a594153329650174bab498d27d158d27531bf77')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
   # Avoid ugly "svn rev unknown from unknown" version string
   patch -p1 < "${srcdir}/do_not_use_svn_version.patch"
+  patch -p1 < "${srcdir}/b8e8aa87f43c12ad564426b3359f593305cd45a1.patch"
 }
 
 build() {
@@ -40,13 +43,13 @@ build() {
       --with-ssl \
       --with-krb5 \
       --with-c-ares \
-      --with-geoip
+      --with-maxmind
   make all
 }
 
 package_wireshark-cli() {
   pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('c-ares' 'geoip' 'krb5' 'libgcrypt' 'libcap' 'libpcap' 'gnutls' 'glib2' 'lua52' 'libssh' 'libxml2' 'libnghttp2')
+  depends=('c-ares' 'libmaxminddb' 'krb5' 'libgcrypt' 'libcap' 'libpcap' 'gnutls' 'glib2' 'lua52' 'libssh' 'libxml2' 'libnghttp2')
   install=wireshark.install
   conflicts=(wireshark)
 
diff --git a/trunk/b8e8aa87f43c12ad564426b3359f593305cd45a1.patch b/trunk/b8e8aa87f43c12ad564426b3359f593305cd45a1.patch
new file mode 100644
index 0000000..13b01c8
--- /dev/null
+++ b/trunk/b8e8aa87f43c12ad564426b3359f593305cd45a1.patch
@@ -0,0 +1,54 @@
+From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001
+From: Roland Knall <rknall@gmail.com>
+Date: Wed, 25 Apr 2018 10:28:30 +0200
+Subject: [PATCH] Qt: Fix various missing header includes
+
+Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing
+
+Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976
+Reviewed-on: https://code.wireshark.org/review/27145
+Petri-Dish: Roland Knall <rknall@gmail.com>
+Tested-by: Petri Dish Buildbot
+Reviewed-by: Roland Knall <rknall@gmail.com>
+---
+ ui/qt/packet_format_group_box.cpp | 1 +
+ ui/qt/time_shift_dialog.cpp       | 1 +
+ ui/qt/wireless_frame.cpp          | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
+index a80a71aaad..3c0fff28aa 100644
+--- a/ui/qt/packet_format_group_box.cpp
++++ b/ui/qt/packet_format_group_box.cpp
+@@ -10,6 +10,7 @@
+ #include <ui_packet_format_group_box.h>
+ 
+ #include <QStyle>
++#include <QStyleOption>
+ 
+ PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
+     QGroupBox(parent),
+diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
+index 93882c09a3..8460db2e96 100644
+--- a/ui/qt/time_shift_dialog.cpp
++++ b/ui/qt/time_shift_dialog.cpp
+@@ -14,6 +14,7 @@
+ #include <ui/time_shift.h>
+ #include <ui/qt/utils/tango_colors.h>
+ 
++#include <QStyleOption>
+ 
+ TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
+     QDialog(parent),
+diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
+index bd9076abcf..46fb2dd2f3 100644
+--- a/ui/qt/wireless_frame.cpp
++++ b/ui/qt/wireless_frame.cpp
+@@ -23,6 +23,7 @@
+ #include <wsutil/frequency-utils.h>
+ 
+ #include <QProcess>
++#include <QAbstractItemView>
+ 
+ // To do:
+ // - Disable or hide invalid channel types.