diff --git a/usr.sbin/kbdmap/kbdmap.pl b/usr.sbin/kbdmap/kbdmap.pl
index 64407bba9e5..6c637776edf 100644
--- a/usr.sbin/kbdmap/kbdmap.pl
+++ b/usr.sbin/kbdmap/kbdmap.pl
@@ -85,7 +85,7 @@ sub font_current {
 
     while(<F>) {
 	/^#/ && next;
-	if (/^\s*font[0-9]+x[0-9]+\s*=\s*(\S+)/) {
+	if (/^\s*font[0-9]+x[0-9]+\s*=\s*\"?([^\s\"]+)\"?/) {
 	    $font_current = $1 if $1 ne "NO";
 	}
     }