--- a/PKGBUILD	2018-03-16 18:23:58.112034593 +0100
+++ b/PKGBUILD	2018-03-16 18:59:17.686017180 +0100
@@ -85,6 +85,10 @@ sha512sums=('SKIP'
 _backports=(
   # core: do not free heap-allocated strings (#8391) (FS#57741)
   '5cbaad2f6795088db56063d20695c6444595822f'
+  # basic/macros: rename noreturn into _noreturn_ (#8456)
+  '848e863acc51ecfb0f3955c498874588201d9130'
+  # core: don't include libmount.h in a header file (#8580)
+  '227b8a762fea1458547be2cdf0e6e4aac0079730'
 )
 
 _reverts=(
@@ -261,7 +265,7 @@ package_systemd() {
   rm -rv "$pkgdir"/etc/systemd/system/*
 
   # we'll create this on installation
-  rmdir "$pkgdir"/var/log/journal/remote
+  rm -rf "$pkgdir"/var/log/journal/remote
 
   # executable (symlinks) shipped with systemd-sysvcompat
   rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}