diff --git a/setup b/setup
index fb06ba6..d018c98 100755
--- a/setup
+++ b/setup
@@ -21,6 +21,13 @@
 	exit 1
 fi
 
+# Check if 'column' command is present
+COLUMN=`which column`
+if [ -z "$COLUMN" ]; then
+    # If it is not, use 'cat'
+	COLUMN=`which cat`
+fi
+
 machine() {
 	local target=$1
 	local build_dir=$2
@@ -54,7 +61,7 @@
 if [ -z "$1" ]; then
 	echo Target machine must be specified. Use one of:
 	echo
-	(echo qemuarm; machine) | sort
+	(echo qemuarm; machine) | sort | $COLUMN
 elif [ "$1" = "qemuarm" ]; then
 	source openbmc-env
 else