diff --git a/zsh/.signature b/zsh/.signature
index cfbe96409..46e9b2963 100644
--- a/zsh/.signature
+++ b/zsh/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/aZfzKiPHqvnbFnfgVPyUC+MCFohrO/m5YTDRHkhzeGCfU1dLQ1jtKYdmb7GDd0qF6hUvznZaaKF5pg40gYzMw4=
-SHA256 (Pkgfile) = 0a1f13f36ddd6f06c803a4cbb6a6c573d63f89552a03964a81503f39cc1451b9
+RWSE3ohX2g5d/aHj95LNlQc/6/1Q0f8i/ii/5J3dumJ3XJ16Odf0RcOC0WPHxyKv6oXQ+GxSvnU2aR+FSCvy8HASFO51dA00JgE=
+SHA256 (Pkgfile) = cb088d1221f0d13072bce1346b8a7eee3127520df01db00d7b044396aea52915
 SHA256 (.footprint) = 98bed021d884a00be0aab7b86f50e33412bb65709f479ad8a07306ae7e5a03a8
 SHA256 (zsh-5.7.1.tar.xz) = 7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8
 SHA256 (_prt-get) = de2e23df932f0c855c0e34389cc8a3d1083b30114f437cb77cb19df2a261b21c
diff --git a/zsh/Pkgfile b/zsh/Pkgfile
index ee1d24799..747d0220f 100644
--- a/zsh/Pkgfile
+++ b/zsh/Pkgfile
@@ -1,8 +1,8 @@
 # Description: Very powerfull shell
-# URL: http://www.zsh.org/
+# URL:         http://www.zsh.org/
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager: Tilman Sauerbeck, tilman at crux dot nu
-# Depends on: libpcre
+# Packager:    Tilman Sauerbeck, tilman at crux dot nu
+# Depends on:  libpcre
 
 name=zsh
 version=5.7.1
@@ -26,13 +26,12 @@ build() {
       --enable-restricted-r \
       --enable-cap
 
-    # fix a bug in recent glibc versions (2.16)
-    sed -e '/#include "attr.mdh"/d;/#include "attr.pro/d' \
-        -e 's|\(#include <sys/xattr.h>\)|\1\n#include "attr.mdh"\n#include "attr.pro"|g' \
-        -i Src/Modules/attr.c
-
+    # fix paths for kbd and usbutils
+    sed -i 's|/usr/share/keymaps|/usr/share/kbd/keymaps|g' Completion/Unix/Command/_loadkeys
+    sed -i 's|/usr/share/misc/usb.ids|/usr/share/usb.ids|g' Completion/Linux/Command/_lsusb
+ 
     make
-    make DESTDIR=$PKG install 
+    make DESTDIR=$PKG install
 
     install -m 644 $SRC/zsh-lovers.1 $PKG/usr/share/man/man1/
 
@@ -46,5 +45,5 @@ build() {
     # so remove them for now (see bug #381).
     rm $PKG/usr/share/zsh/$version/functions/Completion/Unix/_pkg{add,rm,info}
 
-    install -m 644 -t $PKG/usr/share/zsh/site-functions $SRC/_prt-get 
+    install -m 644 -t $PKG/usr/share/zsh/site-functions $SRC/_prt-get
 }