diff --git a/bin/cpu-count b/bin/cpu-count
index c1f47e3c..8fec52c6 100755
--- a/bin/cpu-count
+++ b/bin/cpu-count
@@ -21,5 +21,5 @@ if [ "$1" = "--detail" ]; then
 	grep -i "^model name" /proc/cpuinfo
 	exit 0
 fi
-count=`grep -c "^processor.*:" /proc/cpuinfo`
+count=`getconf _NPROCESSORS_ONLN`
 [ "$count" = "1" ] || printf "%sx" "$count"
diff --git a/debian/changelog b/debian/changelog
index 05c095cb..d6c08b30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
 byobu (2.9) unreleased; urgency=low
 
-  * bin/wifi-quality, bin/network-up, bin/network-down: must use /sbin
-    in iwconfig and ifconfig paths
   * screen-launcher: slightly cleaner bash exit (still could use some
     improvement)
+  * bin/wifi-quality, bin/network-up, bin/network-down: must use /sbin
+    in iwconfig and ifconfig paths
+  * bin/cpu-count: performance improvement, use getconf
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 08 Jun 2009 11:25:02 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 08 Jun 2009 11:27:52 -0500
 
 byobu (2.8-0ubuntu1) karmic; urgency=low