diff --git a/async.cabal b/async.cabal
new file mode 100644
index 0000000..bef4566
--- /dev/null
+++ b/async.cabal
@@ -0,0 +1,98 @@
+name:                async
+version:             2.2.1
+x-revision: 1
+-- don't forget to update ./changelog.md!
+synopsis:            Run IO operations asynchronously and wait for their results
+
+description:
+ This package provides a higher-level interface over
+ threads, in which an @Async a@ is a concurrent
+ thread that will eventually deliver a value of
+ type @a@.  The package provides ways to create
+ @Async@ computations, wait for their results, and
+ cancel them.
+ .
+ Using @Async@ is safer than using threads in two
+ ways:
+ .
+ * When waiting for a thread to return a result,
+   if the thread dies with an exception then the
+   caller must either re-throw the exception
+   ('wait') or handle it ('waitCatch'); the
+   exception cannot be ignored.
+ .
+ * The API makes it possible to build a tree of
+   threads that are automatically killed when
+   their parent dies (see 'withAsync').
+
+license:             BSD3
+license-file:        LICENSE
+author:              Simon Marlow
+maintainer:          Simon Marlow <marlowsd@gmail.com>
+copyright:           (c) Simon Marlow 2012
+category:            Concurrency
+build-type:          Simple
+cabal-version:       >=1.10
+homepage:            https://github.com/simonmar/async
+bug-reports:         https://github.com/simonmar/async/issues
+tested-with:         GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4
+
+extra-source-files:
+    changelog.md
+    bench/race.hs
+
+source-repository head
+    type: git
+    location: https://github.com/simonmar/async.git
+
+library
+    default-language:    Haskell2010
+    other-extensions:    CPP, MagicHash, RankNTypes, UnboxedTuples
+    if impl(ghc>=7.1)
+        other-extensions: Trustworthy
+    exposed-modules:     Control.Concurrent.Async
+    build-depends:       base >= 4.3 && < 4.13, hashable >= 1.1.1.0 && < 1.3, stm >= 2.2 && < 2.6
+
+test-suite test-async
+    default-language: Haskell2010
+    type:       exitcode-stdio-1.0
+    hs-source-dirs: test
+    main-is:    test-async.hs
+    build-depends: base >= 4.3 && < 4.13,
+                   async,
+                   stm,
+                   test-framework,
+                   test-framework-hunit,
+                   HUnit
+
+flag bench
+    default: False
+
+executable concasync
+    if !flag(bench)
+       buildable: False
+    default-language: Haskell2010
+    hs-source-dirs: bench
+    main-is:    concasync.hs
+    build-depends: base, async, stm
+    ghc-options: -O2
+
+executable conccancel
+    if !flag(bench)
+       buildable: False
+    default-language: Haskell2010
+    hs-source-dirs: bench
+    main-is:    conccancel.hs
+    build-depends: base, async, stm
+    ghc-options: -O2 -threaded
+
+executable race
+    if !flag(bench)
+       buildable: False
+    default-language: Haskell2010
+    hs-source-dirs: bench
+    main-is:    race.hs
+    build-depends: base, async, stm
+    ghc-options: -O2 -threaded
+
+
diff --git a/ghc-async.changes b/ghc-async.changes
index 378817f..48c6eac 100644
--- a/ghc-async.changes
+++ b/ghc-async.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 19 13:13:07 UTC 2018 - Peter Simons <psimons@suse.com>
+
+- Update Cabal build instructions to support ghc-8.6.1.
+
 -------------------------------------------------------------------
 Wed Jul 18 14:26:13 UTC 2018 - psimons@suse.com
 
diff --git a/ghc-async.spec b/ghc-async.spec
index b75ebc1..f6d0ca0 100644
--- a/ghc-async.spec
+++ b/ghc-async.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -26,6 +26,7 @@ License:        BSD-3-Clause
 Group:          Development/Libraries/Haskell
 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-hashable-devel
 BuildRequires:  ghc-rpm-macros
@@ -64,6 +65,7 @@ This package provides the Haskell %{pkg_name} library development files.
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build