diff --git a/byobu b/byobu
index 0d3267cc..e2f08fe2 100755
--- a/byobu
+++ b/byobu
@@ -21,7 +21,7 @@ PKG="byobu"
 VERSION=2.41
 
 # Add a version argument for debugging purposes
-if [ "$1" = "-v" ]; then
+if [ "$#" = "1" ] && [ "$1" = "-v" ]; then
 	echo "$PKG version $VERSION"
 	screen -v
 	exit 0
diff --git a/debian/changelog b/debian/changelog
index 794b52b0..94e9b151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 byobu (2.41) unreleased; urgency=low
 
-  * UNRELEASED
+  * byobu: check number of args for "1", and "-v", LP: #494465
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 13 Dec 2009 19:16:43 -0800