diff --git a/ghc-syb.changes b/ghc-syb.changes
index 8886e13..ec646ef 100644
--- a/ghc-syb.changes
+++ b/ghc-syb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 27 12:27:54 UTC 2017 - psimons@suse.com
+
+- Update to version 0.6 revision 1.
+
 -------------------------------------------------------------------
 Sun Jul 10 17:27:39 UTC 2016 - psimons@suse.com
 
diff --git a/ghc-syb.spec b/ghc-syb.spec
index 1120156..bcb5229 100644
--- a/ghc-syb.spec
+++ b/ghc-syb.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-syb
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -23,19 +23,18 @@ Version:        0.6
 Release:        0
 Summary:        Scrap Your Boilerplate
 License:        BSD-3-Clause
-Group:          System/Libraries
+Group:          Development/Languages/Other
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# Begin cabal-rpm deps:
 %if %{with tests}
 BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-mtl-devel
 %endif
-# End cabal-rpm deps
 
 %description
 This package contains the generics system described in the /Scrap Your
@@ -57,21 +56,17 @@ 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
 
-
 %install
 %ghc_lib_install
 sed -i 's/\r$//' README LICENSE
 
 %check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
 
 %post devel
 %ghc_pkg_recache
diff --git a/syb.cabal b/syb.cabal
new file mode 100644
index 0000000..4597e04
--- /dev/null
+++ b/syb.cabal
@@ -0,0 +1,66 @@
+name:                 syb
+version:              0.6
+x-revision: 1
+license:              BSD3
+license-file:         LICENSE
+author:               Ralf Lammel, Simon Peyton Jones, Jose Pedro Magalhaes
+maintainer:           generics@haskell.org
+homepage:             http://www.cs.uu.nl/wiki/GenericProgramming/SYB
+bug-reports:          http://code.google.com/p/scrapyourboilerplate/issues/list
+synopsis:             Scrap Your Boilerplate
+description:
+    This package contains the generics system described in the
+    /Scrap Your Boilerplate/ papers (see
+    <http://www.cs.uu.nl/wiki/GenericProgramming/SYB>).
+    It defines the @Data@ class of types permitting folding and unfolding
+    of constructor applications, instances of this class for primitive
+    types, and a variety of traversals.
+
+category:               Generics
+stability:              provisional
+build-type:             Simple
+cabal-version:          >= 1.8
+tested-with:            GHC >=7.0 && <=7.10.2, GHC==7.11.*
+
+extra-source-files:     tests/*.hs,
+                        README
+
+source-repository head
+  type:                 git
+  location:             https://github.com/dreixel/syb
+
+Library
+  hs-source-dirs:         src
+  build-depends:          base >= 4.0 && < 4.10
+  exposed-modules:        Data.Generics,
+                          Data.Generics.Basics,
+                          Data.Generics.Instances,
+                          Data.Generics.Aliases,
+                          Data.Generics.Schemes,
+                          Data.Generics.Text,
+                          Data.Generics.Twins,
+                          Data.Generics.Builders,
+
+                          Generics.SYB,
+                          Generics.SYB.Basics,
+                          Generics.SYB.Instances,
+                          Generics.SYB.Aliases,
+                          Generics.SYB.Schemes,
+                          Generics.SYB.Text,
+                          Generics.SYB.Twins,
+                          Generics.SYB.Builders
+
+  if impl(ghc < 6.12)
+    ghc-options:          -package-name syb
+
+  ghc-options:            -Wall
+
+test-suite unit-tests
+  type:                   exitcode-stdio-1.0
+  hs-source-dirs:         tests
+  main-is:                Main.hs
+  build-depends:          base
+                        , syb
+                        , HUnit
+                        , containers
+                        , mtl