diff --git a/HsYAML-aeson.cabal b/HsYAML-aeson.cabal
index b1bf0f9..ae1782a 100644
--- a/HsYAML-aeson.cabal
+++ b/HsYAML-aeson.cabal
@@ -1,7 +1,7 @@
 cabal-version:       2.2
 name:                HsYAML-aeson
 version:             0.2.0.0
-x-revision: 1
+x-revision: 2
 license:             GPL-2.0-or-later
 license-file:        LICENSE.GPLv2
 author:              Herbert Valerio Riedel
@@ -32,7 +32,7 @@ library
   exposed-modules: Data.YAML.Aeson
   build-depends:
     , HsYAML      ^>= 0.2.0
-    , aeson       ^>= 1.4.0.0
+    , aeson       >= 1.4.0.0 && < 1.6
     , base         >= 4.5 && < 4.15
     , bytestring  ^>= 0.9.2.1 || ^>= 0.10.0.2
     , containers   >=0.4.2 && <0.7
diff --git a/ghc-HsYAML-aeson.changes b/ghc-HsYAML-aeson.changes
index a29039d..ff797b3 100644
--- a/ghc-HsYAML-aeson.changes
+++ b/ghc-HsYAML-aeson.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 18 10:43:48 UTC 2020 - Peter Simons <psimons@suse.com>
+
+- Replace %setup -q with the more modern %autosetup macro.
+
 -------------------------------------------------------------------
 Tue Jun 16 11:13:37 UTC 2020 - Peter Simons <psimons@suse.com>
 
diff --git a/ghc-HsYAML-aeson.spec b/ghc-HsYAML-aeson.spec
index bb02559..0adb8ae 100644
--- a/ghc-HsYAML-aeson.spec
+++ b/ghc-HsYAML-aeson.spec
@@ -24,7 +24,7 @@ Summary:        JSON to YAML Adapter
 License:        GPL-2.0-or-later
 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
+Source1:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-HsYAML-devel
 BuildRequires:  ghc-aeson-devel
@@ -60,9 +60,8 @@ Requires(postun): ghc-compiler = %{ghc_version}
 This package provides the Haskell %{pkg_name} library development files.
 
 %prep
-%setup -q -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version}
 cp -p %{SOURCE1} %{pkg_name}.cabal
-cabal-tweak-dep-ver aeson '^>= 1.4.0.0' '< 2'
 
 %build
 %ghc_lib_build