diff --git a/add-group.patch b/add-group.patch
index 4c65a7e..4595afc 100644
--- a/add-group.patch
+++ b/add-group.patch
@@ -1,19 +1,20 @@
-diff -Nrup a/ghc-rpm-macros.ghc-extra b/ghc-rpm-macros.ghc-extra
---- a/ghc-rpm-macros.ghc-extra	2013-04-24 09:08:41.000000000 +0200
-+++ b/ghc-rpm-macros.ghc-extra	2013-10-08 13:42:47.232096618 +0200
-@@ -21,6 +21,7 @@
+Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra
+===================================================================
+--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc-extra
++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra
+@@ -9,6 +9,7 @@
  %define basepkg ghc-%{pkgname}\
  %package -n %{basepkg}\
- Summary:        %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\
+ Summary:        Haskell %{pkgname} library\
 +Group:          System/Libraries\
  %{?1:Version:        %{pkgver}}\
  %{-l:License:        %{-l*}}\
- %{?ghc_pkg_obsoletes:Obsoletes:      %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}
-@@ -72,6 +73,7 @@ Summary:        %{?common_summary}%{!?co
- %define basepkg ghc-%{pkgname}\
+ %{?ghc_pkg_obsoletes:Obsoletes:      %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}\
+@@ -18,6 +19,7 @@ This package provides the Haskell %{pkgn
+ \
  %package -n %{basepkg}-devel\
- Summary:        %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\
+ Summary:        Haskell %{pkgname} library development files\
 +Group:          Development/Languages/Other\
  %{?1:Version:        %{pkgver}}\
  %{-l:License:        %{-l*}}\
- %{?ghc_devel_requires}\
+ Requires(post): ghc-compiler = %{ghc_version}\
diff --git a/buildService.patch b/buildService.patch
deleted file mode 100644
index 8553441..0000000
--- a/buildService.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc
-===================================================================
---- ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.orig/ghc-rpm-macros.ghc
-+++ ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc
-@@ -21,13 +21,14 @@ fi
- # configure
- %cabal_configure\
- %ghc_check_bootstrap\
--%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
-+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
- 
- # install
- %cabal_install %cabal copy --destdir=%{buildroot} -v
- 
- # root dir for ghc docs
--%ghcdocbasedir %{_docdir}/ghc/html
-+%ghcdocroot %{_datadir}/doc/ghc
-+%ghcdocbasedir %{ghcdocroot}/html
- # libraries doc dir
- %ghclibdocdir %{ghcdocbasedir}/libraries
- # top library dir
-@@ -100,7 +101,7 @@ find %{buildroot} -type f -exec sh -c "f
- # ghc_lib_build_without_haddock [name] [version]
- %ghc_lib_build_without_haddock()\
- %global debug_package %{nil}\
--%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
-+%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
- %cabal build\
- %{nil}
- 
diff --git a/files-defattr.patch b/files-defattr.patch
index a85d247..4a2f2dd 100644
--- a/files-defattr.patch
+++ b/files-defattr.patch
@@ -1,19 +1,15 @@
-diff -Nrup a/ghc-rpm-macros.ghc-extra b/ghc-rpm-macros.ghc-extra
---- a/ghc-rpm-macros.ghc-extra	2013-10-08 15:35:46.955154547 +0200
-+++ b/ghc-rpm-macros.ghc-extra	2013-10-08 15:33:12.000000000 +0200
-@@ -2,6 +2,7 @@
- 
- %ghc_shared_files\
+Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra
+===================================================================
+--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc-extra
++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra
+@@ -39,8 +39,10 @@ This package provides the Haskell %{pkgn
+ %ghc_pkg_recache\
+ \
  %files -n %{basepkg} -f %{basepkg}.files\
 +%defattr(-,root,root,-)\
  %{?base_doc_files:%doc %base_doc_files}\
- %{nil}
- 
-@@ -54,6 +55,7 @@ Group:          System/Libraries\
- 
- %ghc_devel_files\
+ \
  %files -n %{basepkg}-devel -f %{basepkg}-devel.files\
 +%defattr(-,root,root,-)\
  %{?devel_doc_files:%doc %devel_doc_files}\
  %{nil}
- 
diff --git a/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.tar.bz2 b/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.tar.bz2
deleted file mode 100644
index 8ad73f4..0000000
--- a/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8479e552f32445d948911e42624bb31c809463ed2ac5eddc3549922eae7f3a77
-size 20920
diff --git a/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.tar.bz2 b/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.tar.bz2
new file mode 100644
index 0000000..acb4375
--- /dev/null
+++ b/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a3373ff16dfb9cd4191186b565f52df64b9484b737d21478632f94d7c9f2b21
+size 21128
diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes
index 22b694c..25ff39b 100644
--- a/ghc-rpm-macros.changes
+++ b/ghc-rpm-macros.changes
@@ -1,8 +1,40 @@
+-------------------------------------------------------------------
+Fri Dec 13 21:56:16 UTC 2013 - peter.trommler@ohm-hochschule.de
+
+- fix suse-docdir.patch
+* define _pkgdocdir macro 
+
+-------------------------------------------------------------------
+Wed Dec 11 19:40:34 UTC 2013 - peter.trommler@ohm-hochschule.de
+
+- refresh sle-sp1-rpmdeps.patch 
+
 -------------------------------------------------------------------
 Tue Oct 29 21:01:53 UTC 2013 - peter.trommler@ohm-hochschule.de
 
 - disable colorized documentation for ppc bootstrap 
 
+-------------------------------------------------------------------
+Sat Oct 26 18:34:10 UTC 2013 - peter.trommler@ohm-hochschule.de
+
+- fix typo in email address for patch 2 
+
+-------------------------------------------------------------------
+Sat Oct 26 18:32:22 UTC 2013 - peter.trommler@ohm-hochschule.de
+
+- refresh suse-disable-debug-packages.patch
+- refresh add-group.patch
+- refresh files-defattr.patch 
+
+-------------------------------------------------------------------
+Sat Oct 26 18:26:21 UTC 2013 - peter.trommler@ohm-hochschule.de
+
+- update to 1.2 from upstream
+* update for ghc 7.7 and later
+* fixes for bootstrapping new ghc
+- drop buildService.patch
+* docdirs are unversioned now
+
 -------------------------------------------------------------------
 Fri Oct 11 19:00:13 UTC 2013 - peter.trommler@ohm-hochschule.de
 
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index aca6d93..b3ec991 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -16,14 +16,14 @@
 #
 
 
-%global git_hash 237337a6c6b3299bc6a437446c7f17136fc67ffa
+%global git_hash 4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52
 
 %global macros_dir %{_sysconfdir}/rpm
 
 %global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        0.99
+Version:        1.2
 Release:        0
 Summary:        RPM Macros for building packages for GHC
 License:        GPL-3.0
@@ -33,14 +33,14 @@ Url:            https://fedoraproject.org/wiki/Haskell_SIG
 
 Source0:        http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.bz2
 Source4:        macros.ghc-suse
-# PATCH-FIX-OPENSUSE buildService .patch peter.trommler@ohm-hochschule.de -- openSUSE packaging Haskell guidelines
-Patch:          buildService.patch
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch peter.trommler@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1:         suse-disable-debug-packages.patch
-# PATCH-FIX-OPENSUSE add-group.patch sbahling@suse.com -- Make sure a Group: tag is generated in subpackages; peter.trommler@ohm-hocschule.de: also puts libraries in System/Libraries, see package group guidelines
+# PATCH-FIX-OPENSUSE add-group.patch sbahling@suse.com -- Make sure a Group: tag is generated in subpackages; peter.trommler@ohm-hochschule.de: also puts libraries in System/Libraries, see package group guidelines
 Patch2:         add-group.patch
 # PATCH-FIX-OPENSUSE files-defattr.patch sbahling@suse.com -- Make sure defattr macro used in files sections; peter.trommler@ohm-hochschule.de: see also specfile guidelines, files section, permissions
 Patch3:         files-defattr.patch
+# PATCH-FIX-OPENSUSE suse-docdir.patch peter.trommler@ohm-hochschule.de -- fix location of docdir
+Patch4:         suse-docdir.patch
 # PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.trommler@ohm-hochschule.de -- SLE's RPM is too old in 11 SP1 and SP2
 Patch100:       sle-sp1-rpmdeps.patch
 
@@ -66,10 +66,10 @@ Set of macros to build ghc packages that contain multiple subpackages.
 
 %prep
 %setup -q -n %{name}-%{git_hash}
-%patch -p1 -b .obs
 %patch1 -p1 -b .debug
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %if 0%{?sles_version}
 %patch -P 100 -p1
 %endif
diff --git a/sle-sp1-rpmdeps.patch b/sle-sp1-rpmdeps.patch
index de656e4..80993fd 100644
--- a/sle-sp1-rpmdeps.patch
+++ b/sle-sp1-rpmdeps.patch
@@ -1,7 +1,8 @@
-diff -Nur 0.95.1-suse-packaging/ghc-deps.sh 0.95.1-sle-sp1-rpmdeps/ghc-deps.sh
---- 0.95.1-suse-packaging/ghc-deps.sh	2012-06-24 11:03:36.000000000 +0200
-+++ 0.95.1-sle-sp1-rpmdeps/ghc-deps.sh	2012-06-24 11:18:57.000000000 +0200
-@@ -20,8 +20,8 @@
+Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh
+===================================================================
+--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-deps.sh
++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh
+@@ -25,8 +25,8 @@ else
  fi
  
  case $MODE in
@@ -12,18 +13,19 @@ diff -Nur 0.95.1-suse-packaging/ghc-deps.sh 0.95.1-sle-sp1-rpmdeps/ghc-deps.sh
      *) echo "`basename $0`: Need --provides or --requires" ; exit 1
  esac
  
-@@ -80,4 +80,4 @@
+@@ -81,4 +81,4 @@ for i in $files; do
      fi
  done
  
 -echo $files | tr [:blank:] '\n' | /usr/lib/rpm/rpmdeps $MODE
 +echo $files | tr [:blank:] '\n' | /usr/lib/rpm/find$FINDMODE
-diff -Nur 0.95.1-suse-packaging/ghc-rpm-macros.ghc 0.95.1-sle-sp1-rpmdeps/ghc-rpm-macros.ghc
---- 0.95.1-suse-packaging/ghc-rpm-macros.ghc	2012-06-24 11:30:57.000000000 +0200
-+++ 0.95.1-sle-sp1-rpmdeps/ghc-rpm-macros.ghc	2012-06-24 11:30:09.000000000 +0200
-@@ -262,6 +262,9 @@
- %endif\
- %{nil}
+Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc
+===================================================================
+--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc
++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc
+@@ -121,6 +121,9 @@ if [ -d "%{buildroot}%{_bindir}" ]; then
+ find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\;\
+ fi
  
 +# SLE does not define _rpmconfigdir (yet)
 +%_rpmconfigdir %{_prefix}/lib/rpm
diff --git a/suse-disable-debug-packages.patch b/suse-disable-debug-packages.patch
index eedbd18..05f0a4b 100644
--- a/suse-disable-debug-packages.patch
+++ b/suse-disable-debug-packages.patch
@@ -1,10 +1,10 @@
-Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc
+Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc
 ===================================================================
---- ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.orig/ghc-rpm-macros.ghc
-+++ ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc
-@@ -92,15 +92,25 @@ Requires:       ghc-%{?pkg_name}%{!?pkg_
- find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\
- %endif
+--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc
++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc
+@@ -78,15 +78,25 @@ done\
+ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}.conf\
+ %{nil}
  
 +# ghc_suse_disable_debug_packages
 +%ghc_suse_disable_debug_packages\
@@ -27,6 +27,6 @@ Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.gh
  %ghc_lib_build_without_haddock()\
 -%global debug_package %{nil}\
 +%ghc_suse_disable_debug_packages\
- %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
+ %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
  %cabal build\
  %{nil}
diff --git a/suse-docdir.patch b/suse-docdir.patch
new file mode 100644
index 0000000..e180eb8
--- /dev/null
+++ b/suse-docdir.patch
@@ -0,0 +1,23 @@
+Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc
+===================================================================
+--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc
++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc
+@@ -18,6 +18,9 @@ proceeding, to avoid dependency ABI brea
+ %endif\
+ fi
+ 
++# no _pkgdocdir in openSUSE
++%_pkgdocdir %{_docdir}/%{name}
++
+ # configure
+ %cabal_configure\
+ %ghc_check_bootstrap\
+@@ -27,7 +30,7 @@ fi
+ %cabal_install %cabal copy --destdir=%{buildroot} -v
+ 
+ # root dir for ghc docs
+-%ghcdocbasedir %{_docdir}/ghc/html
++%ghcdocbasedir %{_datadir}/doc/ghc/html
+ # libraries doc dir
+ %ghclibdocdir %{ghcdocbasedir}/libraries
+ # pkg doc dir