Index: usr.sbin/bsdconfig/console/keymap
===================================================================
--- usr.sbin/bsdconfig/console/keymap
+++ usr.sbin/bsdconfig/console/keymap
@@ -172,6 +172,7 @@
 	uk.iso)                defaultitem="$msg_uk_iso"                  ;;
 	ua.koi8-u)             defaultitem="$msg_ukrainian_koi8_u"        ;;
 	ua.koi8-u.shift.alt)   defaultitem="$msg_ukrainian_koi8_u_koi8_r" ;;
+	us.ctrl)               defaultitem="$msg_usa_capslock_ctrl"       ;;
 	us.pc-ctrl)            defaultitem="$msg_usa_capslock_ctrl"       ;;
 	us.dvorak)             defaultitem="$msg_usa_dvorak"              ;;
 	us.dvorakl)            defaultitem="$msg_usa_dvorak_left"         ;;
@@ -307,7 +308,12 @@
 	uk_iso)                  keymap_to_set="uk.iso"                ;;
 	ukrainian_koi8_u)        keymap_to_set="ua.koi8-u"             ;;
 	ukrainian_koi8_u_koi8_r) keymap_to_set="ua.koi8-u.shift.alt"   ;;
-	usa_capslock_ctrl)       keymap_to_set="us.pc-ctrl"            ;;
+	usa_capslock_ctrl)
+		case "$( sysctl -n kern.vty )" in
+		vt)              keymap_to_set="us.ctrl"               ;;
+		*)               keymap_to_set="us.pc-ctrl"            ;;
+		esac
+		;;
 	usa_dvorak)              keymap_to_set="us.dvorak"             ;;
 	usa_dvorak_left)         keymap_to_set="us.dvorakl"            ;;
 	usa_dvorak_right)        keymap_to_set="us.dvorakr"            ;;
Index: usr.sbin/bsdconfig/share/keymap.subr
===================================================================
--- usr.sbin/bsdconfig/share/keymap.subr
+++ usr.sbin/bsdconfig/share/keymap.subr
@@ -39,7 +39,10 @@
 # Defaults taken from usr.sbin/kbdmap/kbdmap.h
 #
 : ${DEFAULT_LANG:=en}
-: ${DEFAULT_KEYMAP_DIR:=/usr/share/syscons/keymaps}
+case "$( sysctl -n kern.vty )" in
+vt)	: ${DEFAULT_KEYMAP_DIR:=/usr/share/vt/keymaps}		;;
+*)	: ${DEFAULT_KEYMAP_DIR:=/usr/share/syscons/keymaps}	;;
+esac
 
 ############################################################ GLOBALS