diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e6cf47f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: cowsay
-# $Id$
-NAME := cowsay
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/cowsay-3.03-help.patch b/cowsay-3.03-help.patch
new file mode 100644
index 0000000..1fc4b4a
--- /dev/null
+++ b/cowsay-3.03-help.patch
@@ -0,0 +1,11 @@
+diff -rup cowsay-3.03.orig/cowsay cowsay-3.03/cowsay
+--- cowsay-3.03.orig/cowsay	2007-09-17 13:27:32.000000000 +0200
++++ cowsay-3.03/cowsay	2007-09-17 13:28:04.000000000 +0200
+@@ -185,3 +185,7 @@ Usage: $progname [-bdgpstwy] [-h] [-e ey
+           [-l] [-n] [-T tongue] [-W wrapcolumn] [message]
+ EOF
+ }
++
++sub main::HELP_MESSAGE {
++	display_usage;
++}
diff --git a/cowsay.spec b/cowsay.spec
index 1b04b67..b1452a2 100644
--- a/cowsay.spec
+++ b/cowsay.spec
@@ -1,13 +1,15 @@
 Name:           cowsay
 Version:        3.03
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Configurable speaking/thinking cow
 Group:          Amusements/Games
-License:        Artistic or GPL
+License:        Artistic or GPLv2+
 URL:            http://www.nog.net/~tony/warez/cowsay.shtml
 Source0:        http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz
 Source1:        cowsay.bashcomp
 Source2:        animalsay
+Patch0:         cowsay-3.03-help.patch
+Patch1:         mech-and-cow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,11 +23,15 @@ pictures of other animals.
 
 %prep
 %setup -q
+%patch0 -p1 -b .help
 %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \
          -e 's#%BANGPERL%#!%{__perl}#' -i %{name}
 %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \
          -e 's#/usr/local/share/cows#%{_datadir}/%{name}#' -i %{name}.1
 
+mv cows/mech-and-cow cows/mech-and-cow.cow
+%patch1 -p1
+
 %build
 echo No need to build anything
 
@@ -57,6 +63,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/bash_completion.d
 
 %changelog
+* Fri May 23 2008 Jon Stanley <jonstanley@gmail.com> - 3.03-5
+- Fix license tag
+
+* Tue Oct 09 2007 Michał Bentkowski <mr.ecik at gmail.com> - 3.03-4
+- Fix mech-and-cow file (#250844)
+
+* Mon Sep 17 2007 Lubomir Kundrak <lkundrak@redhat.com> - 3.03-3
+- Make --help be a bit more sane (#293061)
+
 * Tue Jan 02 2007 Michał Bentkowski <mr.ecik at gmail.com> - 3.03-2
 - Use cp -p to keep timestamps
 - Fix paths in manpage
diff --git a/mech-and-cow.patch b/mech-and-cow.patch
new file mode 100644
index 0000000..c8e97b2
--- /dev/null
+++ b/mech-and-cow.patch
@@ -0,0 +1,45 @@
+--- cowsay/cows/mech-and-cow.cow	2007-10-07 12:17:44.000000000 +0200
++++ cowsay/cows/mech-and-cow.cow.new	2007-10-07 12:17:54.000000000 +0200
+@@ -1,21 +1,22 @@
+-                                   ,-----.
+-                                   |     |
+-                                ,--|     |-.
+-                         __,----|  |     | |
+-                       ,;::     |  `_____' |
+-                       `._______|    i^i   |
+-                                `----| |---'| .
+-                           ,-------._| |== ||//
+-                           |       |_|P`.  /'/
+-                           `-------' 'Y Y/'/'
+-                                     .==\ /_\
++$sthguoht = $thoughts;
++if ( $thoughts eq "\\" ) {
++	$sthguoht = "/";
++}
++$the_cow = <<"EOC";
++   $thoughts                               ,-----.
++   $sthguoht                               |     |
++   $thoughts                            ,--|     |-.
++   $sthguoht                     __,----|  |     | |
++   $thoughts                   ,;::     |  `_____' |
++   $sthguoht                   `._______|    i^i   |
++   $thoughts                            `----| |---'| .
++   $sthguoht                       ,-------._| |== ||//
++   $thoughts                       |       |_|P`.  /'/
++   $sthguoht                       `-------' 'Y Y/'/'
++   $thoughts                                 .==\ /_\
+    ^__^                             /   /'|  `i
+-   (oo)\_______                   /'   /  |   |
+-   (__)\       )\/\             /'    /   |   `i
+-       ||----w |           ___,;`----'.___L_,-'`\__
+-       ||     ||          i_____;----\.____i""\____\
+-
+-
+-
+-
+-
++   ($eyes)\_______                   /'   /  |   |
++   (__)\       )\\/\\             /'    /   |   `i
++    $tongue||----w||           ___,;`----'.___L_,-'`\__
++      ||     ||          i_____;----\.____i""\____\
++EOC