diff --git a/ghc-safe.changes b/ghc-safe.changes
index c1c54f2..6132767 100644
--- a/ghc-safe.changes
+++ b/ghc-safe.changes
@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-Tue Aug 18 10:45:55 UTC 2020 - Peter Simons <psimons@suse.com>
-
-- Replace %setup -q with the more modern %autosetup macro.
-
--------------------------------------------------------------------
-Tue Jun  9 09:10:54 UTC 2020 - psimons@suse.com
-
-- Update safe to version 0.3.19.
-  0.3.19, released 2020-05-24
-      #30, undeprecate maximumDef and friends, fold*1Def
-
 -------------------------------------------------------------------
 Thu Dec  5 03:02:47 UTC 2019 - psimons@suse.com
 
diff --git a/ghc-safe.spec b/ghc-safe.spec
index 2c91d7b..bcaf966 100644
--- a/ghc-safe.spec
+++ b/ghc-safe.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-safe
 #
-# 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,12 +19,13 @@
 %global pkg_name safe
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        0.3.19
+Version:        0.3.18
 Release:        0
 Summary:        Library of safe (exception free) functions
 License:        BSD-3-Clause
 URL:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 %if %{with tests}
@@ -70,7 +71,8 @@ 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}
+cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build
diff --git a/safe-0.3.18.tar.gz b/safe-0.3.18.tar.gz
new file mode 100644
index 0000000..26acb06
--- /dev/null
+++ b/safe-0.3.18.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7775be28af83beeee2fa8921201c6b93358ba6a23a2967d53e5f382a9ec0fed
+size 11208
diff --git a/safe-0.3.19.tar.gz b/safe-0.3.19.tar.gz
deleted file mode 100644
index c17a1ff..0000000
--- a/safe-0.3.19.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25043442c8f8aa95955bb17467d023630632b961aaa61e807e325d9b2c33f7a2
-size 11267
diff --git a/safe.cabal b/safe.cabal
new file mode 100644
index 0000000..591e07b
--- /dev/null
+++ b/safe.cabal
@@ -0,0 +1,74 @@
+cabal-version:  >= 1.18
+build-type:     Simple
+name:           safe
+version:        0.3.18
+x-revision: 1
+license:        BSD3
+license-file:   LICENSE
+category:       Unclassified
+author:         Neil Mitchell <ndmitchell@gmail.com>
+maintainer:     Neil Mitchell <ndmitchell@gmail.com>
+copyright:      Neil Mitchell 2007-2019
+homepage:       https://github.com/ndmitchell/safe#readme
+synopsis:       Library of safe (exception free) functions
+bug-reports:    https://github.com/ndmitchell/safe/issues
+tested-with:    GHC==8.8.1, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3
+description:
+    A library wrapping @Prelude@/@Data.List@ functions that can throw exceptions, such as @head@ and @!!@.
+    Each unsafe function has up to four variants, e.g. with @tail@:
+    .
+    * @tail :: [a] -> [a]@, raises an error on @tail []@.
+    .
+    * @tailMay :: [a] -> /Maybe/ [a]@, turns errors into @Nothing@.
+    .
+    * @tailDef :: /[a]/ -> [a] -> [a]@, takes a default to return on errors.
+    .
+    * @tailNote :: /String/ -> [a] -> [a]@, takes an extra argument which supplements the error message.
+    .
+    * @tailSafe :: [a] -> [a]@, returns some sensible default if possible, @[]@ in the case of @tail@.
+    .
+    This package is divided into three modules:
+    .
+    * "Safe" contains safe variants of @Prelude@ and @Data.List@ functions.
+    .
+    * "Safe.Foldable" contains safe variants of @Foldable@ functions.
+    .
+    * "Safe.Exact" creates crashing versions of functions like @zip@ (errors if the lists are not equal) and @take@ (errors if there are not enough elements), then wraps them to provide safe variants.
+extra-doc-files:
+    CHANGES.txt
+    README.md
+
+source-repository head
+    type:     git
+    location: https://github.com/ndmitchell/safe.git
+
+library
+    default-language: Haskell2010
+    build-depends:
+        base >= 4.8 && < 5
+
+    exposed-modules:
+        Safe
+        Safe.Exact
+        Safe.Foldable
+        Safe.Partial
+
+    other-modules:
+        Safe.Util
+
+test-suite safe-test
+    type:               exitcode-stdio-1.0
+    main-is:            Test.hs
+    default-language:   Haskell2010
+
+    other-modules:
+        Safe
+        Safe.Exact
+        Safe.Foldable
+        Safe.Partial
+        Safe.Util
+    build-depends:
+        base,
+        deepseq,
+        QuickCheck,
+        safe