diff --git a/extra-1.6.18.tar.gz b/extra-1.6.18.tar.gz
new file mode 100644
index 0000000..cce3cde
--- /dev/null
+++ b/extra-1.6.18.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e81788ea870cc94e0cd809f3258aec0a361981783f59b122aeea20801256d4b
+size 40194
diff --git a/extra-1.7.7.tar.gz b/extra-1.7.7.tar.gz
deleted file mode 100644
index f1bc8dd..0000000
--- a/extra-1.7.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba70a036b47c66ec9c7857661750c6a015e95caf5e9527d12684d9d9cd3a33ab
-size 43139
diff --git a/ghc-extra.changes b/ghc-extra.changes
index b358d2e..dde43c6 100644
--- a/ghc-extra.changes
+++ b/ghc-extra.changes
@@ -1,74 +1,3 @@
--------------------------------------------------------------------
-Wed Aug 26 02:02:13 UTC 2020 - psimons@suse.com
-
-- Update extra to version 1.7.7.
-  1.7.7, released 2020-08-25
-      #67, defer to System.IO readFile', hGetContents' in GHC 9.0
-
--------------------------------------------------------------------
-Sat Aug 22 02:01:49 UTC 2020 - psimons@suse.com
-
-- Update extra to version 1.7.6.
-  1.7.6, released 2020-08-21
-      #66, add lots of functions to Data.Foldable.Extra (anyM etc)
-
--------------------------------------------------------------------
-Tue Aug 18 10:44:48 UTC 2020 - Peter Simons <psimons@suse.com>
-
-- Replace %setup -q with the more modern %autosetup macro.
-
--------------------------------------------------------------------
-Thu Aug 13 02:00:26 UTC 2020 - psimons@suse.com
-
-- Update extra to version 1.7.5.
-  1.7.5, released 2020-08-12
-      #65, add Data.Foldable.Extra
-      #65, add sum', product', sumOn' and productOn'
-
--------------------------------------------------------------------
-Thu Jul 16 02:00:23 UTC 2020 - psimons@suse.com
-
-- Update extra to version 1.7.4.
-  1.7.4, released 2020-07-15
-      #59, add whileJustM and untilJustM
-      #61, optimise nubOrd (10% or so)
-      Add first3, second3, third3
-
--------------------------------------------------------------------
-Tue Jun  9 09:10:56 UTC 2020 - psimons@suse.com
-
-- Update extra to version 1.7.3.
-  1.7.3, released 2020-05-30
-      #58, add disjointOrd and disjointOrdBy
-  1.7.2, released 2020-05-25
-      #56, add zipWithLongest
-      #57, make duration in MonadIO
-      Simplify and optimise Barrier
-      Mark modules that are empty as DEPRECATED
-      Remove support for GHC 7.10
-
--------------------------------------------------------------------
-Wed May  6 06:54:11 UTC 2020 - psimons@suse.com
-
-- Update extra to version 1.7.1.
-  1.7.1, released 2020-03-10
-      Add NOINLINE to errorIO to work around a GHC 8.4 bug
-  1.7, released 2020-03-05
-  *   #40, delete deprecated function for
-  *   zipFrom now truncates lists, rather than error, just like zip
-  1.6.21, released 2020-03-02
-      #54, deprecate nubOn since its O(n^2). Use nubOrdOn
-      #53, add some nub functions to NonEmpty
-
--------------------------------------------------------------------
-Thu Feb 27 14:18:04 UTC 2020 - psimons@suse.com
-
-- Update extra to version 1.6.20.
-  1.6.20, released 2020-02-16
-      Add firstM, secondM
-  1.6.19, released 2020-02-11
-      #50, add headDef, lastDef, and dropEnd1
-
 -------------------------------------------------------------------
 Fri Nov  8 16:13:43 UTC 2019 - Peter Simons <psimons@suse.com>
 
diff --git a/ghc-extra.spec b/ghc-extra.spec
index 4790b61..4156908 100644
--- a/ghc-extra.spec
+++ b/ghc-extra.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-extra
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %global pkg_name extra
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        1.7.7
+Version:        1.6.18
 Release:        0
 Summary:        Extra functions I use
 License:        BSD-3-Clause
@@ -31,11 +31,11 @@ BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-semigroups-devel
 BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-unix-devel
 %if %{with tests}
 BuildRequires:  ghc-QuickCheck-devel
-BuildRequires:  ghc-quickcheck-instances-devel
 %endif
 
 %description
@@ -60,7 +60,7 @@ Requires(postun): ghc-compiler = %{ghc_version}
 This package provides the Haskell %{pkg_name} library development files.
 
 %prep
-%autosetup -n %{pkg_name}-%{version}
+%setup -q -n %{pkg_name}-%{version}
 
 %build
 %ghc_lib_build