diff --git a/src/sbin/beep.sh b/src/sbin/beep.sh
index f0c55c6f2..2b6331463 100755
--- a/src/sbin/beep.sh
+++ b/src/sbin/beep.sh
@@ -1,36 +1,26 @@
 #!/bin/sh
 
+COMMAND=${1}
+NOTELENGTH=25
+
 if [ -f /conf/config.xml ]; then
-	BEEP=`/usr/bin/grep -c disablebeep /conf/config.xml`
-	if [ $BEEP -gt 0 ]; then
+	if [ "$(/usr/bin/grep -c disablebeep /conf/config.xml)" != "0" ]; then
 		exit;
 	fi
 fi
 
-# Standard note length
-NOTELENGTH="25"
-
-# Check for different HZ
-if [ -f /boot/loader.conf ]; then
-	HZ=`/usr/bin/grep -c kern.hz /boot/loader.conf`
-	if [ "$HZ" = "1" ]; then
-		NOTELENGTH="10"
+if [ -c "/dev/speaker" ]; then
+	if [ "${COMMAND}" = "start" ]; then
+		/usr/local/bin/beep -p 500 $NOTELENGTH
+		/usr/local/bin/beep -p 400 $NOTELENGTH
+		/usr/local/bin/beep -p 600 $NOTELENGTH
+		/usr/local/bin/beep -p 800 $NOTELENGTH
+		/usr/local/bin/beep -p 800 $NOTELENGTH
+	elif [ "${COMMAND}" = "stop" ]; then
+		/usr/local/bin/beep -p 600 $NOTELENGTH
+		/usr/local/bin/beep -p 800 $NOTELENGTH
+		/usr/local/bin/beep -p 500 $NOTELENGTH
+		/usr/local/bin/beep -p 400 $NOTELENGTH
+		/usr/local/bin/beep -p 400 $NOTELENGTH
 	fi
 fi
-
-if [ -c "/dev/speaker" ]; then
-		if [ "$1" = "start" ]; then
-			/usr/local/bin/beep -p 500 $NOTELENGTH
-			/usr/local/bin/beep -p 400 $NOTELENGTH
-			/usr/local/bin/beep -p 600 $NOTELENGTH
-			/usr/local/bin/beep -p 800 $NOTELENGTH
-			/usr/local/bin/beep -p 800 $NOTELENGTH
-		fi
-		if [ "$1" = "stop" ]; then
-			/usr/local/bin/beep -p 600 $NOTELENGTH
-			/usr/local/bin/beep -p 800 $NOTELENGTH
-			/usr/local/bin/beep -p 500 $NOTELENGTH
-			/usr/local/bin/beep -p 400 $NOTELENGTH
-			/usr/local/bin/beep -p 400 $NOTELENGTH
-		fi
-fi