--- PKGBUILD	2015-09-21 07:07:24.295581881 +0900
+++ PKGBUILD.step1	2015-09-22 23:15:18.024066774 +0900
@@ -130,16 +130,10 @@
   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
 
   ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
+  rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
 
   ### split off runtime libraries
-  rm -rf "$srcdir/_libsystemd"
-  install -dm755 "$srcdir"/_libsystemd/usr/lib
-  cd "$srcdir"/_libsystemd
-  mv "$pkgdir"/usr/lib/lib{systemd,udev}*.so* usr/lib
+  rm "$pkgdir"/usr/lib/lib{systemd,udev}*.so*
 
   # add example bootctl configuration
   install -Dm644 "$srcdir/arch.conf" "$pkgdir"/usr/share/systemd/bootctl/arch.conf
@@ -154,7 +148,9 @@
   provides=('libsystemd.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
             'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so')
 
-  mv "$srcdir/_libsystemd"/* "$pkgdir"
+  install -dm755 "$pkgdir"/usr/lib/
+  mv "$srcdir"/systemd/.libs/lib{systemd,udev}*.so* "$pkgdir"/usr/lib
+
 }
 
 package_systemd-sysvcompat() {
@@ -164,7 +160,9 @@
   conflicts=('sysvinit')
   depends=('systemd')
 
-  mv "$srcdir/_sysvcompat"/* "$pkgdir"
+  install -dm755 "$pkgdir"/usr/share/man/man8/
+  mv "$srcdir"/systemd/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+     "$pkgdir"/usr/share/man/man8
 
   install -dm755 "$pkgdir/usr/bin"
   for tool in runlevel reboot shutdown poweroff halt telinit; do