diff --git a/ghc-yaml.changes b/ghc-yaml.changes
index 985e26c..43a6234 100644
--- a/ghc-yaml.changes
+++ b/ghc-yaml.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jul 10 17:27:47 UTC 2016 - psimons@suse.com
+
+- Update to version 0.8.18 revision 0 with cabal2obs.
+
 -------------------------------------------------------------------
 Mon Jun 27 11:04:26 UTC 2016 - mimi.vx@gmail.com
 
diff --git a/ghc-yaml.spec b/ghc-yaml.spec
index 9045913..3efef0e 100644
--- a/ghc-yaml.spec
+++ b/ghc-yaml.spec
@@ -17,25 +17,26 @@
 
 
 %global pkg_name yaml
-Name:           ghc-yaml
+%bcond_with tests
+Name:           ghc-%{pkg_name}
 Version:        0.8.18
 Release:        0
 Summary:        Support for parsing and rendering YAML documents
 License:        BSD-3-Clause
 Group:          System/Libraries
-Url:            http://hackage.haskell.org/package/%{pkg_name}
-Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-# End cabal-rpm deps
+Url:            https://hackage.haskell.org/package/%{pkg_name}
+Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+# Begin cabal-rpm deps:
 BuildRequires:  chrpath
 BuildRequires:  ghc-Cabal-devel
-# Begin cabal-rpm deps:
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-attoparsec-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-enclosed-exceptions-devel
-BuildRequires:  ghc-raw-strings-qq-devel
+BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel
@@ -44,40 +45,49 @@ BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unordered-containers-devel
 BuildRequires:  ghc-vector-devel
-BuildRequires:  libyaml-devel
-BuildRequires:  pkgconfig(pkg-config)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{with tests}
+BuildRequires:  ghc-HUnit-devel
+BuildRequires:  ghc-aeson-qq-devel
+BuildRequires:  ghc-base-compat-devel
+BuildRequires:  ghc-hspec-devel
+BuildRequires:  ghc-mockery-devel
+%endif
+# End cabal-rpm deps
 
 %description
-Provides support for parsing and emitting Yaml documents.
-
-The package is broken down into two modules.
-"Data.Yaml" provides a high-level interface based
-around the JSON datatypes provided by the 'aeson'
-package. "Text.Libyaml" provides a lower-level,
-streaming interface. For most users, "Data.Yaml" is recommended.
+Please see the README.md file.
 
 %package devel
-Summary:        Haskell %{name} library development files
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries/Other
 Requires:       %{name} = %{version}-%{release}
 Requires:       ghc-compiler = %{ghc_version}
-Requires:       libyaml-devel
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
 
 %description devel
-This package provides the Haskell yaml library development files.
+This package provides the Haskell %{pkg_name} library development files.
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
+
 %build
-%define cabal_configure_options -f system-libyaml
 %ghc_lib_build
 
+
 %install
 %ghc_lib_install
-%ghc_fix_dynamic_rpath yaml2json
-%ghc_fix_dynamic_rpath json2yaml
+
+%ghc_fix_dynamic_rpath json2yaml yaml2json
+
+
+%check
+%if %{with tests}
+%{cabal} test
+%endif
+
 
 %post devel
 %ghc_pkg_recache
@@ -88,10 +98,11 @@ This package provides the Haskell yaml library development files.
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_bindir}/yaml2json
 %{_bindir}/json2yaml
+%{_bindir}/yaml2json
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%doc ChangeLog.md README.md examples
 
 %changelog