diff --git a/usr/lib/byobu/cpu_count b/usr/lib/byobu/cpu_count
index f30535c3..7fca5ba6 100755
--- a/usr/lib/byobu/cpu_count
+++ b/usr/lib/byobu/cpu_count
@@ -24,11 +24,11 @@ __cpu_count_detail() {
 }
 
 __cpu_count() {
-	if [ $(uname) = "FreeBSD" ]; then
-		c=$(sysctl -n hw.ncpu)
-	else
-		local c
-		c=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
-	fi
+	local c
+	c=$(getconf _NPROCESSORS_ONLN 2>/dev/null || \
+		grep -ci "^processor" /proc/cpuinfo || \
+		sysctl -n hw.ncpu)
 	[ "$c" = "1" ] || printf "%sx" "$c"
 }
+
+# vi: syntax=sh ts=4 noexpandtab
diff --git a/usr/lib/byobu/cpu_freq b/usr/lib/byobu/cpu_freq
index 4ec4640c..27b6449e 100755
--- a/usr/lib/byobu/cpu_freq
+++ b/usr/lib/byobu/cpu_freq
@@ -25,11 +25,8 @@ __cpu_freq_detail() {
 
 __cpu_freq() {
 	local hz freq count
-	if [ $(uname) = "FreeBSD" ]; then
-		hz=$(sysctl -n machdep.tsc_freq)
-		fpdiv $hz "1000000000" 1
-		freq="$_RET"
-	elif [ -r "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" ]; then
+
+	if [ -r "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" ]; then
 		read hz < /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
 		fpdiv $hz "1000000" 1 # 1Ghz
 		freq="$_RET"
@@ -37,7 +34,6 @@ __cpu_freq() {
 		if egrep -q -s -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo; then
 			freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%01.1f", $2 / 1000 }')
 		else
-			# Must scale frequency by number of processors, if counting bogomips
 			count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
 			freq=$(egrep -i -m 1 "^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ print $2 }')
 			freq=$(printf "%s %s" "$freq" "$count" | awk '{printf "%01.1f\n", $1/$2/1000}')
@@ -45,7 +41,11 @@ __cpu_freq() {
 	elif hz=$(sysctl -n hw.cpufrequency 2>/dev/null); then
 		fpdiv $hz "1000000000" 1 # 1Ghz
 		freq="$_RET"
+	elif hz=$(sysctl -n machdep.tsc_freq 2>/dev/null); then
+		fpdiv $hz "1000000000" 1
+		freq="$_RET"
 	fi
+
 	[ -n "$freq" ] || return
 	color b c W; printf "%s" "$freq"; color -; color c W; printf "%s" "$ICON_GHz"; color --
 }
diff --git a/usr/lib/byobu/users b/usr/lib/byobu/users
index 2c648d77..0d8dd21f 100755
--- a/usr/lib/byobu/users
+++ b/usr/lib/byobu/users
@@ -40,3 +40,5 @@ __users() {
 		rm -f "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/users"*
 	fi
 }
+
+# vi: syntax=sh ts=4 noexpandtab