diff --git a/ghc-tagged.changes b/ghc-tagged.changes
index 09128dd..646ed07 100644
--- a/ghc-tagged.changes
+++ b/ghc-tagged.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jul 10 17:17:11 UTC 2016 - psimons@suse.com
+
+- Update to version 0.8.4 revision 0 with cabal2obs.
+
 -------------------------------------------------------------------
 Tue Apr 26 08:55:10 UTC 2016 - mimi.vx@gmail.com
 
diff --git a/ghc-tagged.spec b/ghc-tagged.spec
index 18d0579..2fa6d9e 100644
--- a/ghc-tagged.spec
+++ b/ghc-tagged.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-tagged
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,48 +17,48 @@
 
 
 %global pkg_name tagged
-
-Name:           ghc-tagged
+Name:           ghc-%{pkg_name}
 Version:        0.8.4
 Release:        0
 Summary:        Haskell 98 phantom types to avoid unsafely passing dummy arguments
 License:        BSD-3-Clause
 Group:          System/Libraries
-
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 BuildRequires:  ghc-Cabal-devel
+# Begin cabal-rpm deps:
 BuildRequires:  ghc-deepseq-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-template-haskell-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# End cabal-rpm deps
 
 %description
 Haskell 98 phantom types to avoid unsafely passing dummy arguments.
 
-
 %package devel
 Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries/Other
+Requires:       %{name} = %{version}-%{release}
 Requires:       ghc-compiler = %{ghc_version}
 Requires(post): ghc-compiler = %{ghc_version}
 Requires(postun): ghc-compiler = %{ghc_version}
-Requires:       %{name} = %{version}-%{release}
 
 %description devel
 This package provides the Haskell %{pkg_name} library development files.
 
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
+
 %build
 %ghc_lib_build
 
+
 %install
 %ghc_lib_install
 
+
 %post devel
 %ghc_pkg_recache
 
@@ -71,6 +71,6 @@ This package provides the Haskell %{pkg_name} library development files.
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
-%doc README.markdown
+%doc CHANGELOG.markdown README.markdown
 
 %changelog