diff --git a/gzip/.footprint b/gzip/.footprint
index 39f58b6f..388d9f17 100644
--- a/gzip/.footprint
+++ b/gzip/.footprint
@@ -5,7 +5,7 @@ drwxr-xr-x	root/root	bin/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gzexe
--rwxr-xr-x	root/root	usr/bin/uncompress
+lrwxrwxrwx	root/root	usr/bin/uncompress -> /bin/gunzip
 -rwxr-xr-x	root/root	usr/bin/zcmp
 -rwxr-xr-x	root/root	usr/bin/zdiff
 -rwxr-xr-x	root/root	usr/bin/zegrep
diff --git a/gzip/Pkgfile b/gzip/Pkgfile
index 8c5e6155..eeb0c993 100644
--- a/gzip/Pkgfile
+++ b/gzip/Pkgfile
@@ -4,7 +4,7 @@
 
 name=gzip
 version=1.5
-release=1
+release=2
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
 
 build() {
@@ -21,5 +21,10 @@ build() {
     ln -s gzip.1.gz  $PKG/usr/man/man1/zcat.1.gz
     ln -s zdiff.1.gz $PKG/usr/man/man1/zcmp.1.gz
 
+    # make uncompress a symlink to gunzip, since the hardlink
+    # will not work if / and /usr are on different file systems.
+    rm $PKG/usr/bin/uncompress
+    ln -s /bin/gunzip $PKG/usr/bin/uncompress
+
     rm -r $PKG/usr/share
 }
diff --git a/kbd/.footprint b/kbd/.footprint
index 6c00fe30..3308fd0a 100644
--- a/kbd/.footprint
+++ b/kbd/.footprint
@@ -337,10 +337,15 @@ drwxr-xr-x	root/root	usr/share/kbd/keymaps/i386/colemak/
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/colemak/en-latin9.map.gz
 drwxr-xr-x	root/root	usr/share/kbd/keymaps/i386/dvorak/
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
+-rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-ca-fr.map.gz
+-rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-es.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-fr.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-ru.map.gz
+-rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-sv-a1.map.gz
+-rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-sv-a5.map.gz
+-rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak-uk.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/dvorak.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/dvorak/no.map.gz
 drwxr-xr-x	root/root	usr/share/kbd/keymaps/i386/fgGIod/
@@ -454,6 +459,7 @@ drwxr-xr-x	root/root	usr/share/kbd/keymaps/i386/qwerty/
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/qwerty/ruwin_alt-CP1251.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz
+-rw-r--r--	root/root	usr/share/kbd/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/qwerty/ruwin_cplk-CP1251.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map.gz
 -rw-r--r--	root/root	usr/share/kbd/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map.gz
diff --git a/kbd/.md5sum b/kbd/.md5sum
index bcdd1b26..0db36989 100644
--- a/kbd/.md5sum
+++ b/kbd/.md5sum
@@ -1 +1 @@
-8143e179a0f3c25646ce5085e8777200  kbd-1.15.3.tar.gz
+3c8297b373f7217332d09baf80d43fc1  kbd-1.15.4.tar.gz
diff --git a/kbd/Pkgfile b/kbd/Pkgfile
index 82472a79..2261a327 100644
--- a/kbd/Pkgfile
+++ b/kbd/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=kbd
-version=1.15.3
+version=1.15.4
 release=1
 source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/$name-$version.tar.gz)
 
@@ -13,8 +13,9 @@ build() {
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
                 --datadir=/usr/share/kbd \
+                --disable-vlock \
                 --disable-nls
-    make
+    make -j1
     make DESTDIR=$PKG install
 
     ln -sf default8x16.psfu.gz $PKG/usr/share/kbd/consolefonts/default.gz