diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 24d2b58..d22274c 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -192,16 +192,20 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
 
 # install bin package
 %ghc_bin_install\
+%if %{undefined ghc_bootstrapping}\
 %global _use_internal_dependency_generator 0\
 %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
+%endif\
 %cabal_install\
 %ghc_strip_dynlinked
 
 # ghc_lib_install [name] [version]
 %ghc_lib_install()\
+%if %{undefined ghc_bootstrapping}\
 %global _use_internal_dependency_generator 0\
 %global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\
 %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
+%endif\
 %{?1:cd %1-%2}\
 %cabal_install\
 %cabal_pkg_conf\
@@ -218,3 +222,10 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
 %global without_prof 1\
 %global without_haddock 1\
 %global without_manual 1
+
+# skip prof libs, and documentation
+# - without_hscolour needs to be set locally in the spec file
+%ghc_test\
+%global without_prof 1\
+%global without_haddock 1\
+%global without_manual 1
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 12fbaed..db20c5b 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -3,7 +3,7 @@
 %global macros_file %{_sysconfdir}/rpm/macros.ghc
 
 Name:           ghc-rpm-macros
-Version:        0.13.9
+Version:        0.13.10
 Release:        1%{?dist}
 Summary:        Macros for building packages for GHC
 
@@ -60,6 +60,10 @@ EOF
 
 
 %changelog
+* Tue Sep 13 2011 Jens Petersen <petersen@redhat.com> - 0.13.10-1
+- do not setup ghc-deps.sh when ghc_bootstrapping
+- add ghc_test build config
+
 * Wed Aug  3 2011 Jens Petersen <petersen@redhat.com> - 0.13.9-1
 - drop without_testsuite from ghc_bootstrap since it breaks koji