diff --git a/ghc-old-time.changes b/ghc-old-time.changes
index 9efda50..db59266 100644
--- a/ghc-old-time.changes
+++ b/ghc-old-time.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Sun Jul 10 17:16:04 UTC 2016 - psimons@suse.com
-
-- Update to version 1.1.0.3 revision 1 with cabal2obs.
-
 -------------------------------------------------------------------
 Thu May 14 07:35:57 UTC 2015 - mimi.vx@gmail.com
 
diff --git a/ghc-old-time.spec b/ghc-old-time.spec
index a5b0ef1..7440201 100644
--- a/ghc-old-time.spec
+++ b/ghc-old-time.spec
@@ -22,16 +22,14 @@ Version:        1.1.0.3
 Release:        0
 Summary:        Time library
 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
+Source1:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
-# Begin cabal-rpm deps:
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-rpm-macros
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# End cabal-rpm deps
 
 %description
 This package provides the old time library.
@@ -54,15 +52,12 @@ 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
 
-
 %post devel
 %ghc_pkg_recache
 
@@ -75,6 +70,5 @@ cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
-%doc changelog.md
 
 %changelog
diff --git a/1.cabal b/old-time.cabal
similarity index 95%
rename from 1.cabal
rename to old-time.cabal
index 367ef9d..9fc569c 100644
--- a/1.cabal
+++ b/old-time.cabal
@@ -1,60 +1,60 @@
-name:           old-time
-version:        1.1.0.3
-x-revision: 1
--- NOTE: Don't forget to update ./changelog.md
-license:        BSD3
-license-file:   LICENSE
-maintainer:     libraries@haskell.org
-bug-reports:    https://github.com/haskell/old-time/issues
-synopsis:       Time library
-category:       System
-build-type:     Configure
-cabal-Version:  >=1.10
-description:
-    This package provides the old time library.
-    .
-    For new projects, the newer
-    <http://hackage.haskell.org/package/time time library>
-    is recommended.
-
-extra-source-files:
-    aclocal.m4
-    changelog.md
-    config.guess
-    config.sub
-    configure
-    configure.ac
-    include/HsTimeConfig.h.in
-    install-sh
-    old-time.buildinfo
-
-extra-tmp-files:
-    autom4te.cache
-    config.log
-    config.status
-    include/HsTimeConfig.h
-
-source-repository head
-    type:     git
-    location: https://github.com/haskell/old-time.git
-
-Library
-    default-language: Haskell2010
-    other-extensions: Trustworthy
-
-    exposed-modules:
-        System.Time
-
-    c-sources:
-        cbits/timeUtils.c
-
-    include-dirs: include
-    includes:     HsTime.h
-    install-includes:
-        HsTime.h
-
-    build-depends:
-        base       >= 4.7 && < 4.10,
-        old-locale == 1.0.*
-
-    ghc-options: -Wall
+name:           old-time
+version:        1.1.0.3
+x-revision: 1
+-- NOTE: Don't forget to update ./changelog.md
+license:        BSD3
+license-file:   LICENSE
+maintainer:     libraries@haskell.org
+bug-reports:    https://github.com/haskell/old-time/issues
+synopsis:       Time library
+category:       System
+build-type:     Configure
+cabal-Version:  >=1.10
+description:
+    This package provides the old time library.
+    .
+    For new projects, the newer
+    <http://hackage.haskell.org/package/time time library>
+    is recommended.
+
+extra-source-files:
+    aclocal.m4
+    changelog.md
+    config.guess
+    config.sub
+    configure
+    configure.ac
+    include/HsTimeConfig.h.in
+    install-sh
+    old-time.buildinfo
+
+extra-tmp-files:
+    autom4te.cache
+    config.log
+    config.status
+    include/HsTimeConfig.h
+
+source-repository head
+    type:     git
+    location: https://github.com/haskell/old-time.git
+
+Library
+    default-language: Haskell2010
+    other-extensions: Trustworthy
+
+    exposed-modules:
+        System.Time
+
+    c-sources:
+        cbits/timeUtils.c
+
+    include-dirs: include
+    includes:     HsTime.h
+    install-includes:
+        HsTime.h
+
+    build-depends:
+        base       >= 4.7 && < 4.10,
+        old-locale == 1.0.*
+
+    ghc-options: -Wall