diff --git a/brainfuck.spec b/brainfuck.spec
index ba04771..fd79f4e 100644
--- a/brainfuck.spec
+++ b/brainfuck.spec
@@ -1,32 +1,31 @@
-# cabal2spec-0.25
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name brainfuck
 
-%global common_summary Haskell %{pkg_name} library
+%global common_summary Brainfuck interpreter
 
-%global common_description A %{pkg_name} library for Haskell.
+%global common_description This is an interpreter of the brainf*ck language,\
+written in the pure, lazy, functional language Haskell.
 
 Name:           %{pkg_name}
 Version:        0.1
-Release:        3%{?dist}
-Summary:        Haskell %{pkg_name}
+Release:        4%{?dist}
+Summary:        %{common_summary}
 
-Group:          System Environment/Libraries
-License:        GPLv2
-# BEGIN cabal2spec
+# Language/Brainfuck.hs states version 2 or later
+License:        GPLv2+
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 Patch0:         brainfuck-0.1-fix-fsf-address.patch
-ExclusiveArch:  %{ghc_arches}
-BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
 
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
 BuildRequires:  ghc-array-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-unix-devel
+# End cabal-rpm deps
 
 %description
 %{common_description}
@@ -41,12 +40,10 @@ BuildRequires:  ghc-unix-devel
 %install
 %ghc_lib_install
 
-# library subpackage
 %ghc_package
 
 %ghc_description
 
-# devel subpackage
 %ghc_devel_package
 
 %ghc_devel_description
@@ -60,6 +57,10 @@ BuildRequires:  ghc-unix-devel
 %ghc_files LICENSE
 
 %changelog
+* Sun Nov 18 2012 Jens Petersen <petersen@redhat.com> - 0.1-4
+- update with cabal-rpm
+- change license tag to GPLv2+ according to Brainfuck.hs
+
 * Fri Sep 07 2012 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 0.1-3
 - Added patch to fix FSF address