diff --git a/2.cabal b/ed25519.cabal
similarity index 100%
rename from 2.cabal
rename to ed25519.cabal
diff --git a/ghc-ed25519.changes b/ghc-ed25519.changes
index 9357294..5c6788b 100644
--- a/ghc-ed25519.changes
+++ b/ghc-ed25519.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug  3 15:38:38 UTC 2017 - psimons@suse.com
+
+- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf.
+
 -------------------------------------------------------------------
 Sun Jul 10 17:04:45 UTC 2016 - psimons@suse.com
 
diff --git a/ghc-ed25519.spec b/ghc-ed25519.spec
index bf84cab..140117f 100644
--- a/ghc-ed25519.spec
+++ b/ghc-ed25519.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-ed25519
 #
-# 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,15 +23,13 @@ Version:        0.0.5.0
 Release:        0
 Summary:        Ed25519 cryptographic signatures
 License:        MIT
-Group:          System/Libraries
-Url:            https://hackage.haskell.org/package/%{pkg_name}
+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/2.cabal
+Source1:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
-# Begin cabal-rpm deps:
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-rpm-macros
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with tests}
 BuildRequires:  ghc-QuickCheck-devel
 BuildRequires:  ghc-directory-devel
@@ -39,7 +37,6 @@ BuildRequires:  ghc-doctest-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-hlint-devel
 %endif
-# End cabal-rpm deps
 
 %description
 This package provides a simple, fast, self-contained copy of the Ed25519
@@ -49,7 +46,7 @@ implementation, including usage guidelines.
 
 %package devel
 Summary:        Haskell %{pkg_name} library development files
-Group:          Development/Libraries/Other
+Group:          Development/Libraries/Haskell
 Requires:       %{name} = %{version}-%{release}
 Requires:       ghc-compiler = %{ghc_version}
 Requires(post): ghc-compiler = %{ghc_version}
@@ -62,20 +59,14 @@ This package provides the Haskell %{pkg_name} library development files.
 %setup -q -n %{pkg_name}-%{version}
 cp -p %{SOURCE1} %{pkg_name}.cabal
 
-
 %build
 %ghc_lib_build
 
-
 %install
 %ghc_lib_install
 
-
 %check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
 
 %post devel
 %ghc_pkg_recache
@@ -84,11 +75,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal
 %ghc_pkg_recache
 
 %files -f %{name}.files
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 
 %files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
 %doc AUTHORS.txt CHANGELOG.md README.md
 
 %changelog