diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 47bfcb1..56495fc 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -13,20 +13,21 @@ pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('x86_64')
 license=('GPL')
 url="http://www.wesnoth.org/"
-depends=('sdl2_ttf' 'sdl2_net' 'sdl2_mixer' 'sdl2_image' 'fribidi' 'boost-libs' 'pango' 'lua52' 'dbus' 'python2')
+depends=('sdl2_ttf' 'sdl2_net' 'sdl2_mixer' 'sdl2_image' 'fribidi' 'boost-libs' 'pango' 'lua53' 'dbus')
 makedepends=('boost' 'cmake' 'git')
+optdepends=('python' 'python2')
 replaces=('wesnoth-data')
 options=(!emptydirs)
 source=("git://github.com/wesnoth/wesnoth.git#tag=${pkgver}"
-        wesnothd.tmpfiles.conf
         wesnothd.service)
 sha512sums=('SKIP'
-            '6e776bf9d4e6f289b1dddbea03b0cc6972af9e926c8305fac823613b101d7f3bc40f30ab73708e9df355b28cc6459b138f3d8015528796ad94d3571d20dd54ed'
-            '9d648c8bd13a574364b4dede4b1084a2fe1bf50a38ad04aa1a9f72f168915fc67d29b3c048f881a32f38a785fd4256d48c864346db08326e279237b28d5ca884')
+            'abd9ed53864b9e248ea10706c584cce6fc0b10086b4ad9470a6759fdbd0d113816af97a76c59cf9f6bb884d1021d2427b10ed95053d95ad16fb1e7380b41d40a')
 
 prepare() {
   cd $pkgname
   git cherry-pick -n 9d0e3bae096563297c9f51355968f27a67dbfdec # Fix build with boost 1.70
+  #Fix to package HighContrast icons
+  sed -i 's|install(DIRECTORY packaging/icons/hicolor DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons )|install(DIRECTORY packaging/icons DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} )|' CMakeLists.txt
 }
 
 build() {
@@ -35,10 +36,7 @@ build() {
   mkdir build && cd build
   cmake .. \
       -DCMAKE_INSTALL_PREFIX=/usr \
-      -DENABLE_OMP=ON \
-      -DENABLE_TOOLS=ON \
-      -DMANDIR=share/man \
-      -DFIFO_DIR=/var/run/wesnothd \
+      -DFIFO_DIR=/run/wesnothd \
       -DENABLE_DISPLAY_REVISION=OFF
   make
 }
@@ -49,6 +47,5 @@ package() {
   cd build
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir/wesnothd.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnothd.conf"
   install -Dm644 "$srcdir/wesnothd.service" "$pkgdir/usr/lib/systemd/system/wesnothd.service"
 }
diff --git a/trunk/wesnothd.service b/trunk/wesnothd.service
index ab83528..a33c71f 100644
--- a/trunk/wesnothd.service
+++ b/trunk/wesnothd.service
@@ -4,6 +4,8 @@ After=network.target
 
 [Service]
 ExecStart=/usr/bin/wesnothd
+RuntimeDirectory=wesnothd
+RuntimeDirectoryMode=0700
 
 [Install]
 WantedBy=multi-user.target
diff --git a/trunk/wesnothd.tmpfiles.conf b/trunk/wesnothd.tmpfiles.conf
deleted file mode 100644
index 55c6244..0000000
--- a/trunk/wesnothd.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/wesnothd 0700 root root -