diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 04156e2..d6a6c23 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -41,7 +41,9 @@ build() {
     --enable-ipv6 \
     --enable-libmount-mount \
     --enable-mountconfig \
-    --with-start-statd=/usr/bin/start-statd
+    --with-start-statd=/usr/bin/start-statd \
+    --enable-systemd
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
@@ -66,10 +68,7 @@ package_nfs-utils() {
  
   install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf
   install -D -m 644 nfs.conf "$pkgdir"/etc/nfs.conf
-  
-  for i in systemd/{*.service,*.mount,*.target}; do
-    install -D -m 644 $i "$pkgdir"/usr/lib/systemd/system/$(basename $i)
-  done
+
   install -d -m 755 "$pkgdir"/usr/share/doc/$pkgname
   install -D -m 644 systemd/README "$pkgdir"/usr/share/doc/$pkgname/README.systemd