diff --git a/hlint.spec b/hlint.spec
index 07926d0..01d898f 100644
--- a/hlint.spec
+++ b/hlint.spec
@@ -7,29 +7,23 @@
 # Haskell library dependencies:
 %global ghc_pkg_deps ghc-cpphs-devel, ghc-haskell-src-exts-devel, ghc-uniplate-devel, ghc-hscolour-devel
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           %{pkg_name}
 Version:        1.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          Development/Languages
 License:        GPLv2
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-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")}
 
 %description
@@ -45,17 +39,12 @@ BuildRequires:  hscolour
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/hlint.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %ghc_binlib_package
 
 
@@ -68,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 18 2011 Jens Petersen <petersen@redhat.com> - 1.8.3-3
+- update to cabal2spec-0.22.4
+
 * Sun Dec  5 2010 Jens Petersen <petersen@redhat.com> - 1.8.3-2
 - rebuild