diff --git a/ponysay b/ponysay
index 1fcecad3..5fe2e7ce 100755
--- a/ponysay
+++ b/ponysay
@@ -4,6 +4,7 @@ version=0.4
 SYSTEMPONIES=/usr/share/ponies
 HOMEPONIES="${HOME}/.ponies"
 pony=
+wrap=
 
 cmd=cowsay
 [[ ${0} == *ponythink ]] && cmd=cowthink
@@ -22,14 +23,16 @@ usage() {
     echo "  -v          Show version and exit"
     echo "  -h          Show this help and exit"
     echo "  -f[name]    Select a pony (Either a filename or a pony name)"
+    echo "  -W[column]  The screen column where the message should be wrapped"
 }
 
-while getopts f:hv OPT
+while getopts f:W:hv OPT
 do
     case ${OPT} in
         v)  version; exit ;;
         h)  usage; exit ;;
-        f)  pony=$OPTARG ;;
+        f)  pony="$OPTARG" ;;
+        W)  wrap="$OPTARG" ;;
         \?) usage >&2; exit 1 ;;
     esac
 done
@@ -57,4 +60,4 @@ fi
 # Ponies use UTF-8 drawing characters. Prevent a Perl warning.
 export PERL_UNICODE=S
 
-exec "$cmd" -f "$pony"
+exec "$cmd" -f "$pony" "${wrap:+-W$wrap}"