diff --git a/srcpkgs/bdf2psf b/srcpkgs/bdf2psf
new file mode 120000
index 00000000000..a60a065a154
--- /dev/null
+++ b/srcpkgs/bdf2psf
@@ -0,0 +1 @@
+console-setup
\ No newline at end of file
diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
deleted file mode 100644
index d4c8de2e902..00000000000
--- a/srcpkgs/bdf2psf/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'bdf2psf'
-pkgname=bdf2psf
-version=1.211
-revision=1
-revision=2
-depends="perl"
-short_desc="Generate console fonts from BDF source fonts"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2.0-or-later"
-homepage="https://packages.debian.org/sid/bdf2psf"
-distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=298de99c8f135c461b0f72eca3376c090e5f86669b35c0b31377674854512125
-
-post_extract() {
-	vsed -i -e '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf
-}
-
-do_install() {
-	cd Fonts
-	vbin bdf2psf
-	vman ../man/bdf2psf.1
-	for f in *.equivalents *.set; do
-		vinstall $f 0644 usr/share/bdf2psf
-	done
-	vcopy fontsets usr/share/bdf2psf
-}
-
-ckbcomp_package() {
-	depends="perl"
-	short_desc="Compile a XKB keyboard description to a keymap for loadkeys"
-	pkg_install() {
-		vbin Keyboard/ckbcomp
-	}
-}
diff --git a/srcpkgs/bdf2psf/update b/srcpkgs/bdf2psf/update
deleted file mode 100644
index 78f2b0fbb9f..00000000000
--- a/srcpkgs/bdf2psf/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname='console-setup'
diff --git a/srcpkgs/ckbcomp b/srcpkgs/ckbcomp
index 942762041d6..a60a065a154 120000
--- a/srcpkgs/ckbcomp
+++ b/srcpkgs/ckbcomp
@@ -1 +1 @@
-bdf2psf
\ No newline at end of file
+console-setup
\ No newline at end of file
diff --git a/srcpkgs/console-setup/template b/srcpkgs/console-setup/template
new file mode 100644
index 00000000000..1cd3289e790
--- /dev/null
+++ b/srcpkgs/console-setup/template
@@ -0,0 +1,50 @@
+# Template file for 'console-setup'
+pkgname=console-setup
+version=1.211
+revision=3
+hostmakedepends="perl"
+depends="kbd ckbcomp"
+short_desc="Console font and keymap setup program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
+homepage="https://packages.debian.org/sid/console-setup"
+distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
+checksum=298de99c8f135c461b0f72eca3376c090e5f86669b35c0b31377674854512125
+
+post_extract() {
+	vsed -i -e '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf
+}
+
+do_install() {
+	make etcdir=${DESTDIR}/etc prefix=${DESTDIR}/usr \
+		bootprefix=${DESTDIR}/usr \
+		install-common
+	vmkdir usr/share/console-setup
+	mv ${DESTDIR}/etc/default/keyboard \
+		${DESTDIR}/usr/share/console-setup
+	mv ${DESTDIR}/etc/default/console-setup \
+		${DESTDIR}/usr/share/console-setup
+}
+
+bdf2psf_package() {
+	depends="perl"
+	short_desc="Generate console fonts from BDF source fonts"
+	pkg_install() {
+		cd Fonts
+		vbin bdf2psf
+		vman ../man/bdf2psf.1
+		for f in *.equivalents *.set; do
+			vinstall $f 0644 usr/share/bdf2psf
+		done
+		vcopy fontsets usr/share/bdf2psf
+	}
+}
+
+ckbcomp_package() {
+	depends="perl"
+	short_desc="Compile a XKB keyboard description to a keymap for loadkeys"
+	pkg_install() {
+		make etcdir=${PKGDESTDIR}/etc prefix=${PKGDESTDIR}/usr \
+			install-ckbcomp
+	}
+}