diff --git a/usr.sbin/spkrtest/spkrtest.8 b/usr.sbin/spkrtest/spkrtest.8
index 58eced5be0de..a7266c7e7be1 100644
--- a/usr.sbin/spkrtest/spkrtest.8
+++ b/usr.sbin/spkrtest/spkrtest.8
@@ -23,12 +23,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd July 23, 1995
+.Dd March 6, 2022
 .Dt SPKRTEST 8
 .Os
 .Sh NAME
 .Nm spkrtest
 .Nd test script for the speaker driver
+.Sh SYNOPSIS
+.Nm
 .Sh DESCRIPTION
 The
 .Nm
@@ -38,8 +40,10 @@ utility is an easy to use test script for the speaker driver.
 .It Pa /dev/speaker
 speaker device file
 .El
+.Sh EXIT STATUS
+.Ex -std
 .Sh SEE ALSO
-.Xr dialog 1 ,
+.Xr bsddialog 1 ,
 .Xr spkr 4
 .Sh HISTORY
 The
diff --git a/usr.sbin/spkrtest/spkrtest.sh b/usr.sbin/spkrtest/spkrtest.sh
index 4acfb6750015..417d38350233 100644
--- a/usr.sbin/spkrtest/spkrtest.sh
+++ b/usr.sbin/spkrtest/spkrtest.sh
@@ -53,21 +53,21 @@ then
 	cleanExit 1
 fi
 
-/usr/bin/dialog --title "Speaker test" --checklist \
+/usr/bin/bsddialog --title " Speaker test " --checklist \
 	"Please select the melodies you wish to play (space for select)" \
 	0 0 0 \
-	reveille "Reveille" OFF \
-	contact "Contact theme from Close Encounters" OFF \
-	dance "Lord of the Dance (aka Simple Gifts)" OFF \
-	loony "Loony Toons theme" OFF \
-	sinister "Standard villain's entrance music" OFF \
-	rightstuff "A trope from 'The Right Stuff' score by Bill Conti" OFF \
-	toccata "Opening bars of Bach's Toccata and Fugue in D Minor" OFF \
-	startrek "Opening bars of the theme from Star Trek Classic" OFF \
+	reveille "Reveille" off \
+	contact "Contact theme from Close Encounters" off \
+	dance "Lord of the Dance (aka Simple Gifts)" off \
+	loony "Loony Toons theme" off \
+	sinister "Standard villain's entrance music" off \
+	rightstuff "A trope from 'The Right Stuff' score by Bill Conti" off \
+	toccata "Opening bars of Bach's Toccata and Fugue in D Minor" off \
+	startrek "Opening bars of the theme from Star Trek Classic" off \
 		2> ${choices} || cleanExit 0
 
 echo ""
-tunes="`cat ${choices} | tr -d '\"'`"
+tunes="`cat ${choices}`"
 for tune in ${tunes:-DEFAULT}
 do
 	case ${tune:-NULL} in