diff -Nur debian.old/control debian/control
--- debian.old/control	2015-10-02 10:15:45.000000000 +0000
+++ debian/control	2015-12-11 19:50:24.000000000 +0000
@@ -26,7 +26,7 @@
 Package: console-setup
 Section: utils
 Architecture: all
-Depends: debconf (>= 1.5.34), console-setup-linux, xkb-data (>= 0.9), keyboard-configuration (= ${source:Version}), initramfs-tools (>= 0.85eubuntu12) | linux-initramfs-tool, ${misc:Depends}
+Depends: debconf (>= 1.5.34), console-setup-linux | console-setup-freebsd, xkb-data (>= 0.9), keyboard-configuration (= ${source:Version}), initramfs-tools (>= 0.85eubuntu12) | linux-initramfs-tool | console-setup-freebsd, ${misc:Depends}
 Suggests: lsb-base (>= 3.0-6), locales
 Conflicts: console-setup-mini
 Breaks: lsb-core (<< 2.0-6), lsb (<< 2.0-6), lsb-base (<< 3.0-6)
@@ -48,7 +48,7 @@
 Priority: extra
 Architecture: all
 Recommends: kbd | console-tools
-Depends: console-setup-linux, debconf (>= 0.5) | debconf-2.0, keyboard-configuration (= ${source:Version}), ${misc:Depends}
+Depends: console-setup-linux | console-setup-freebsd, debconf (>= 0.5) | debconf-2.0, keyboard-configuration (= ${source:Version}), ${misc:Depends}
 Suggests: lsb-base (>= 3.0-6)
 Conflicts: console-setup
 Breaks: lsb-core (<< 2.0-6), lsb (<< 2.0-6), lsb-base (<< 3.0-6)
@@ -76,6 +76,17 @@
  This package includes fonts in psf format and definitions of various
  8-bit charmaps.
 
+Package: console-setup-freebsd
+Section: utils
+Priority: optional
+Architecture: kfreebsd-any
+Depends: vidcontrol, kbdcontrol, keyboard-configuration (= ${source:Version}), ${misc:Depends}
+Suggests: console-setup
+Breaks: console-setup (<< 1.71)
+Replaces: console-setup (<< 1.71)
+Description: FreeBSD specific part of console-setup
+ This package includes raw, uuencoded fonts and various screen maps.
+
 Package: bdf2psf
 Section: utils
 Priority: optional
@@ -102,7 +113,7 @@
 Package: console-setup-udeb
 Section: debian-installer
 Priority: extra
-Depends: archdetect, cdebconf-udeb, kbd-udeb | kbdcontrol-udeb | hurd-udeb, cdebconf-newt-detect-keys, ${misc:Depends}
+Depends: archdetect, cdebconf-udeb, kbd-udeb | kbdcontrol-udeb | hurd-udeb, cdebconf-newt-detect-keys | kbdcontrol-udeb | hurd-udeb, ${misc:Depends}
 Provides: keyboard-setup
 Architecture: all
 Description: Configure the keyboard
diff -Nur debian.old/keyboard-configuration.postinst debian/keyboard-configuration.postinst
--- debian.old/keyboard-configuration.postinst	2015-10-20 12:02:17.000000000 +0000
+++ debian/keyboard-configuration.postinst	2015-12-11 19:24:58.000000000 +0000
@@ -99,7 +99,7 @@
 	fi
     else
 	case "`uname`" in
-	    *GNU*)
+	    GNU)
 		[ ! -f /var/run/hurd-console.pid ] || kill `cat /var/run/hurd-console.pid`
 		;;
 	    *)