diff --git a/gpsd/PKGBUILD b/gpsd/PKGBUILD
index c56e4711b7..0e97b6f7c0 100644
--- a/gpsd/PKGBUILD
+++ b/gpsd/PKGBUILD
@@ -4,11 +4,12 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Giacomo Rizzo <alt@free-os.it>
+
 pkgname=gpsd
-pkgver=3.18.1
+pkgver=3.19
 pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('x86_64' 'powerpc64le')
+arch=(x86_64 powerpc64le)
 url="http://catb.org/gpsd/"
 license=('BSD')
 depends=('python' 'libusb' 'bluez-libs')
@@ -18,16 +19,22 @@ optdepends=('gtk3: GUI frontends'
             'python-cairo: GUI frontends'
             'python-gobject: GUI frontends'
             'qt5-base: for Qgpsmm')
-makedepends=('scons' 'docbook-xsl' 'qt5-base' 'python')
+makedepends=('scons' 'docbook-xsl' 'qt5-base' 'python' 'python2-gobject' 'python2-cairo') # remove python2 makedeps when scons moves to python3
 backup=('etc/default/gpsd')
 source=(https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
-        $pkgname.conf)
-sha256sums=('5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e'
+        $pkgname.conf fix-python-libdir.patch)
+sha256sums=('27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39'
             'SKIP'
-            'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f')
+            'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f'
+            '631cf609db1f4b26b94d324a9ca16624487781f0b8736c5c59d8c45acc5d7322')
 validpgpkeys=('EED4A0893DCC705DB309E202CCF29C7238522905') # Gary E. Miller <gem@rellim.com>
 # validpgpkeys=('41876B2F579463A499843D1DECC8208F8C6C738D') # Eric S. Raymond
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../fix-python-libdir.patch # Fix python install dir
+}
+
 build() {
   cd $pkgname-$pkgver
 
@@ -43,8 +50,6 @@ build() {
 package() {
   cd $pkgname-$pkgver
 
-  # Fix man pages path (FS#21715)
-  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
   # Fix path in systemd files
   sed -i 's|local/sbin|bin|' systemd/{gpsd.service,gpsdctl@.service}
 
diff --git a/gpsd/fix-python-libdir.patch b/gpsd/fix-python-libdir.patch
new file mode 100644
index 0000000000..69d14b99b4
--- /dev/null
+++ b/gpsd/fix-python-libdir.patch
@@ -0,0 +1,14 @@
+diff --git a/SConstruct b/SConstruct
+index b8f3fb1..e133ece 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1034,8 +1034,6 @@ else:
+             # follow FHS, put in /usr/local/libXX, not /usr/libXX
+             # may be lib, lib32 or lib64
+             python_libdir = polystr(python_libdir)
+-            python_libdir = python_libdir.replace("/usr/lib",
+-                                                  "/usr/local/lib")
+ 
+         py_config_text = config.GetPythonValue('config vars',
+                                                PYTHON_SYSCONFIG_IMPORT,
+