diff --git a/srcpkgs/kbd-common b/srcpkgs/kbd-common
new file mode 120000
index 0000000000..04e5d3b5d7
--- /dev/null
+++ b/srcpkgs/kbd-common
@@ -0,0 +1 @@
+kbd
\ No newline at end of file
diff --git a/srcpkgs/kbd/kbd-common.template b/srcpkgs/kbd/kbd-common.template
new file mode 100644
index 0000000000..e61e56196a
--- /dev/null
+++ b/srcpkgs/kbd/kbd-common.template
@@ -0,0 +1,15 @@
+# Template file for 'kbd-common'.
+#
+noarch=yes
+short_desc="${short_desc} -- development files"
+long_desc="${long_desc}
+
+ This package contains the keymaps and console fonts."
+
+replaces="kbd<1.15.3_6"
+
+do_install() {
+	for d in consolefonts consoletrans unimaps keymaps; do
+		vmove usr/share/kbd/${d} usr/share/kbd
+	done
+}
diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template
index 1b63939b58..25019712da 100644
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@@ -1,24 +1,30 @@
 # Template file for 'kbd'
 pkgname=kbd
 version=1.15.3
-revision=5
-homepage="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
-distfiles="${KERNEL_SITE}/utils/kbd/kbd-$version.tar.bz2"
+revision=6
 build_style=configure
 configure_args="--prefix=/usr --datadir=/usr/share/kbd
---localedir=/usr/share/kbd/locale --mandir=/usr/share/man"
+ --localedir=/usr/share/kbd/locale --mandir=/usr/share/man"
 makedepends="flex"
 short_desc="Linux keyboard utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
+distfiles="http://ftp.cc.uoc.gr/mirrors/ftp.kernel.org/pub/linux/utils/kbd/kbd-${version}.tar.bz2"
 checksum=63fafacf72635a064a370d044b75d9134083a5c15629b0b0f2a27b49bc07bbcf
 long_desc="
  This package allows you to set up the Linux console, change the font,
  resize text mode virtual consoles and remap the keyboard."
 
+depends="kbd-common"
+subpackages="kbd-common"
 
 post_install() {
 	# Remove olpc keymaps, they conflict with qwerty ones!
 	# and who in earth uses olpc anyway??
 	rm -rf ${DESTDIR}/usr/share/kbd/keymaps/i386/olpc
+	# Remove keymaps for sun, amiga and atari.
+	for f in sun amiga atari; do
+		rm -rf ${DESTDIR}/usr/share/kbd/keymaps/${f}
+	done
 }