diff --git a/ghc-uniplate.spec b/ghc-uniplate.spec
index 84c180d..63f8e0e 100644
--- a/ghc-uniplate.spec
+++ b/ghc-uniplate.spec
@@ -6,25 +6,19 @@
 original Scrap Your Boilerplate work. It requires few extensions to\
 Haskell.
 
-%global ghc_pkg_deps ghc-mtl-devel, ghc-syb-devel
-
-# debuginfo is not useful for ghc
-%global debug_package %{nil}
-
 Name:           ghc-%{pkg_name}
 Version:        1.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        %{common_summary}
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://community.haskell.org/~ndm/uniplate/
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
-BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.7.3
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
 BuildRequires:  hscolour
-%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+BuildRequires:  ghc-containers-prof, ghc-syb-prof
 
 %description
 %{common_description}
@@ -49,6 +43,10 @@ This package provides the shared library.
 
 
 %changelog
+* Wed Jun 22 2011 Jens Petersen <petersen@redhat.com> - 1.6-6
+- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)
+- no longer requires mtl
+
 * Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.6-5
 - Enable build on sparcv9