diff --git a/gpsd/PKGBUILD b/gpsd/PKGBUILD
index 09b381f40..58b53cf5f 100644
--- a/gpsd/PKGBUILD
+++ b/gpsd/PKGBUILD
@@ -1,58 +1,62 @@
-# Maintainer Bruce Liu <brli@users.sourceforge.net>
-
 pkgname=gpsd
-pkgver=3.16
-pkgrel=2
+pkgver=3.18
+pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('x86_64')
 url="http://catb.org/gpsd/"
-screenshot="http://www.catb.org/gpsd/gpsd2.png"
 license=('BSD')
-depends=('python2' 'libusb' 'bluez-libs' 'desktop-file-utils')
+depends=('python3' 'libusb' 'bluez-libs')
 optdepends=('php: generate a PHP status page for your GPS'
-            'php-gd: image support for the PHP status page')
-makedepends=('scons' 'docbook-xsl' 'hardening-wrapper')
-backup=('etc/conf.d/gpsd')
-install="${pkgname}.install"
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-sha1sums=('f211a45eb6e8d067df2d02f7d9347e3977296ed9'
-          'SKIP')
-validpgpkeys=('41876B2F579463A499843D1DECC8208F8C6C738D') # Eric S. Raymond (Also known as 'ESR'.)
+            'php-gd: image support for the PHP status page'
+            'qt5-base: for Qgpsmm')
+makedepends=('scons' 'docbook-xsl' 'qt5-base')
+backup=('etc/default/gpsd')
+source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        $pkgname.conf)
+sha256sums=('48521f5158f5fda4c88a6f75e8bfc1ee67e999e3fc095e4a06cb8c2af56712f4'
+            'SKIP'
+            'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f')
+validpgpkeys=('EED4A0893DCC705DB309E202CCF29C7238522905') # Gary E. Miller <gem@rellim.com>
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  export LINKFLAGS="${LDFLAGS}"
   scons prefix=/usr \
-    systemd=yes \
-    libQgpsmm=no
+        systemd=yes \
+        gpsd_group=uucp \
+        sbindir=/usr/bin \
+        qt_versioned=5
   scons build
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  msg 'Fix man pages path '
+  # Fix man pages path (Arch's FS#21715)
   sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
-  msg 'Installation'
-  export DESTDIR="${pkgdir}"
+
+  export DESTDIR="$pkgdir"
   scons install
+  install -Dm755 gpsinit -t "$pkgdir/usr/bin"
+  chmod 755 "$pkgdir"/usr/bin/*
 
-  sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules
+  install -Dm644 "$srcdir/gpsd.conf" "$pkgdir/etc/default/gpsd"
 
-  install -Dm644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
+  install -Dm644 "gpsd.rules" "$pkgdir/usr/lib/udev/rules.d/25-gpsd-usb.rules"
 
-  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
-  install -Dm755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
+  install -Dm755 gpsd.hotplug "$pkgdir/usr/lib/udev/gpsd.hotplug"
 
-  install -D -m644 packaging/X11/xgps.desktop \
+  install -Dm644 packaging/X11/xgps.desktop \
     "${pkgdir}/usr/share/applications/xgps.desktop"
-  install -D -m644 packaging/X11/xgpsspeed.desktop \
+  install -Dm644 packaging/X11/xgpsspeed.desktop \
     "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
-  install -D -m644 packaging/X11/gpsd-logo.png \
+  install -Dm644 packaging/X11/gpsd-logo.png \
     "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
 
-  install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service"
-  install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket"
+  install -Dm644 systemd/gpsd.service "$pkgdir/usr/lib/systemd/system/gpsd.service"
+  install -Dm644 systemd/gpsd.socket "$pkgdir/usr/lib/systemd/system/gpsd.socket"
+  install -Dm644 systemd/gpsdctl@.service "$pkgdir/usr/lib/systemd/system/gpsdctl@.service"
 
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/gpsd/gpsd.conf b/gpsd/gpsd.conf
new file mode 100644
index 000000000..9fef72cb9
--- /dev/null
+++ b/gpsd/gpsd.conf
@@ -0,0 +1,5 @@
+# Default settings for gpsd.
+START_DAEMON="true"
+GPSD_OPTIONS=""
+DEVICES=""
+USBAUTO="true"
diff --git a/gpsd/gpsd.install b/gpsd/gpsd.install
deleted file mode 100644
index ee661fcb1..000000000
--- a/gpsd/gpsd.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    echo ">>> Note: the supplied gpsd udev rules are device-specific, so"
-    echo ">>> if your device isn't detected correctly, please use lsusb or"
-    echo ">>> another suitable tool to determine the proper device IDs and"
-    echo ">>> use the commented rules to fill in the blanks for your device."
-
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    update-desktop-database -q
-}
-
-post_remove() {
-    update-desktop-database -q
-}