diff --git a/chami.patch b/chami.patch
index 389f02a..0fbab2d 100644
--- a/chami.patch
+++ b/chami.patch
@@ -1,7 +1,7 @@
 Index: cowsay-3.03/cows/chameleon.cow
 ===================================================================
 --- /dev/null
-+++ cowsay-3.03/cows/chameleon.cow
++++ cowsay-3.03/share/cows/chameleon.cow
 @@ -0,0 +1,25 @@
 +##
 +## SUSE-like chameleon
diff --git a/cowsay-3.04.tar.gz b/cowsay-3.04.tar.gz
deleted file mode 100644
index a10da40..0000000
--- a/cowsay-3.04.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8b871332cfc1f0b6c16832ecca413ca0ac14d58626491a6733829e3d655878b
-size 31961
diff --git a/cowsay-3.7.0.tar.gz b/cowsay-3.7.0.tar.gz
new file mode 100644
index 0000000..a478503
--- /dev/null
+++ b/cowsay-3.7.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af13a93f1559ea435403cf11eaa6c46be5bf03ac165a4acb471c66a4976167e0
+size 34030
diff --git a/cowsay.changes b/cowsay.changes
index 9cb969b..d2243f5 100644
--- a/cowsay.changes
+++ b/cowsay.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Dec  3 17:45:48 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 3.7.0
+  * cowsay -r [-C] for random cow
+  * Pluggable cow collections using etc/cowsay/cowpath.d
+  * Parseable format for cowsay -l when sent to non-terminal
+    destination
+  * Fix cowsay -l ignoring *.pm files
+  * Have cowsay -l recursively discover cowfiles in subdirectories
+- Update to 3.5
+  * Add llama cow
+  * Changed to SemVer version numbering
+- Switch to cowsay-org fork:
+  * Version 3.04.01
+  * Fix the version number in source files
+- Adjust chami.patch for different directory structure
+- Drop fixed one-eye.patch
+
 -------------------------------------------------------------------
 Wed Sep  2 16:24:11 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/cowsay.spec b/cowsay.spec
index 1ba0d36..989ef0b 100644
--- a/cowsay.spec
+++ b/cowsay.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cowsay
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,49 +16,42 @@
 #
 
 
-%if 0%{?suse_version} >= 1140
 %{?!perl_requires:%define perl_requires() Requires: perl = %{perl_version}}
-%endif
 Name:           cowsay
-Version:        3.04
+Version:        3.7.0
 Release:        0
 Summary:        Configurable talking cow (and some other creatures)
 License:        GPL-3.0-or-later
 Group:          Amusements/Toys/Other
-URL:            https://github.com/tnalpgge/rank-amateur-cowsay
-Source:         https://github.com/tnalpgge/rank-amateur-cowsay/archive/cowsay-%{version}.tar.gz
-Patch0:         one-eye.patch
-Patch1:         chami.patch
-BuildRequires:  bash
+URL:            https://cowsay.diamonds/
+Source:         https://github.com/cowsay-org/cowsay/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         chami.patch
+BuildRequires:  make
 BuildRequires:  perl
 BuildArch:      noarch
 %{perl_requires}
 
 %description
-cowsay is a configurable talking cow, written in Perl.  It operates
+cowsay is a configurable talking cow, written in Perl. It operates
 much as the figlet program does, and it written in the same spirit
 of silliness.
 
 %prep
-%setup -q -n rank-amateur-cowsay-%{name}-%{version}
-sed -i "s|,\$%{nil}PREFIX,|,%{_prefix},|" install.sh
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
+sed -i '1 s/env //' cowsay
 
 %build
 perl -c cowsay
 
 %install
-bash ./install.sh %{buildroot}%{_prefix}
-mv -T %{buildroot}%{_prefix}/man/ %{buildroot}%{_mandir}
-rm -f %{buildroot}%{_datadir}/cows/mech-and-cow
+%make_install prefix=%{_prefix}
 
 %files
-%license LICENSE
-%doc ChangeLog MANIFEST README
+%license LICENSE.txt
+%doc ChangeLog README.md
 %{_bindir}/%{name}
 %{_bindir}/cowthink
-%{_datadir}/cows
+%{_datadir}/cowsay
 %{_mandir}/man1/*
 
 %changelog
diff --git a/one-eye.patch b/one-eye.patch
deleted file mode 100644
index 8c61bac..0000000
--- a/one-eye.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: cowsay-3.03/cowsay
-===================================================================
---- cowsay-3.03.orig/cowsay
-+++ cowsay-3.03/cowsay
-@@ -66,6 +66,7 @@ $Text::Wrap::columns = $opts{'W'};
- 	    split("\n", fill("", "", @message)));
- &construct_balloon;
- &construct_face;
-+$eye = substr($eyes,0,1);
- &get_cow;
- print @balloon_lines;
- print $the_cow;