diff --git a/ghc-colour.spec b/ghc-colour.spec
index 5f1493f..4e7cc7b 100644
--- a/ghc-colour.spec
+++ b/ghc-colour.spec
@@ -7,15 +7,12 @@ transparency. Colours can be blended and composed. Various \
 colour spaces are supported. A module of colour names \
 ("Data.Colour.Names") is provided.
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        2.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -26,12 +23,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.8.1
-%if %{with hscolour}
+BuildRequires:  ghc-rpm-macros >= 0.7.3
 BuildRequires:  hscolour
-%endif
 %{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
 %{common_description}
@@ -49,19 +43,18 @@ This package provides the shared library.
 
 
 %install
-rm -rf %{buildroot}
 %ghc_lib_install
 echo "%{_datadir}/%{pkg_name}-%{version}/" >> %{name}.files
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %{?ghc_lib_package}
 
 
 %changelog
+* Sat Jan 15 2011 Ben Boeckel <mathstuf@gmail.com> - 2.3.1-4
+- Update to cabal2spec-0.22.4
+- Rebuild
+
 * Sun Nov 28 2010 Ben Boeckel <mathstuf@gmail.com> - 2.3.1-3
 - Rebuild for GHC7