diff --git a/.gitignore b/.gitignore
index 564470e..31a8cd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ boinc-6.10.45.tar.xz
 /boinc-6.12.35.tar.xz
 /boinc-6.12.43.tar.xz
 /boinc-7.0.29.tar.xz
+/boinc-7.0.36.tar.xz
diff --git a/boinc-client.spec b/boinc-client.spec
index e003416..0ac1a8b 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -1,10 +1,10 @@
-%global revision 25790
+%global revision 26158
 %global version_ 7_0a
 
 Summary:	The BOINC client core
 Name:		boinc-client
-Version:	7.0.29
-Release:	3.r%{revision}svn%{?dist}
+Version:	7.0.36
+Release:	1.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -13,6 +13,7 @@ URL:		http://boinc.berkeley.edu/
 # svn export http://boinc.berkeley.edu/svn/branches/boinc_core_release_%{version_}
 # pushd boinc_core_release_%{version_}
 # patch -p0 < boinc-client-X11.patch
+# sed -i 's/\(AC_PROG_CXX\)/\1\nAC_PROG_OBJCXX/' configure.ac
 # ./_autosetup
 # ./trim . Trim all binaries and other unnecessary things.
 # popd
@@ -33,9 +34,6 @@ Source9:	boinc-client-X11.patch
 Patch0:		boinc-guirpcauth.patch
 # Show notification upon failure to client in manager
 Patch1:		boinc-manager-client-notification.patch
-# fix client menu display
-# Filed upstream: http://boinc.berkeley.edu/trac/ticket/1130
-Patch2:		boinc-client-menu.patch
 # build fix for new xcb-util
 # Filed upstream: http://boinc.berkeley.edu/trac/ticket/1174
 Patch3:		boinc-xcb-compat.patch
@@ -129,7 +127,6 @@ This package contains documentation files for %{name}.
 %setup -q -n boinc_core_release_%{version_}
 %patch0
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 # fix utf8
@@ -170,7 +167,8 @@ sed -i 's/BOINC-Manager\.po/BOINC-Manager\.mo/g' locale/Makefile.in
 # Install user hints
 install -p -m644 %{SOURCE4} .
 
-sed -i 's/#   CLIENTGUI_SUBDIRS += clientscr/   CLIENTGUI_SUBDIRS += clientscr/' Makefile.in
+# Build screensaver
+sed -i 's/#   CLIENTGUI_SUBDIRS += clientscr/CLIENTGUI_SUBDIRS += clientscr/' Makefile.am
 
 %global confflags --disable-dependency-tracking --enable-dynamic-client-linkage --disable-server --disable-fcgi --enable-unicode --with-ssl --with-x STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
 
@@ -365,6 +363,11 @@ fi
 %{_includedir}/boinc
 
 %changelog
+* Sun Jan 12 2013 Miloš Jakubíček <xjakub@fi.muni.cz> - 7.0.36-1.r26158svn
+- Rebase the 7.0a branch to 7.0.36
+- Removed non-free code as per BZ#894290
+- Dropped boinc-client-menu.patch (merged upstream)
+
 * Mon Aug 20 2012 Adam Jackson <ajax@redhat.com> 7.0.29-3.r25790svn
 - Rebuild for new xcb-util soname
 
diff --git a/sources b/sources
index 3759ecb..03ab440 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4039373a0ecbbf68eca36f2ef17d3fdb  boinc-7.0.29.tar.xz
+f4cba5e973f90bf327d3b767a2eaf5b6  boinc-7.0.36.tar.xz
diff --git a/trim b/trim
index 7402f69..3097bc8 100755
--- a/trim
+++ b/trim
@@ -9,7 +9,7 @@ fi
 
 echo "Trimming directories..."
 
-DIRS="win_build html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart coprocs"
+DIRS="win_build html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart coprocs _bak"
 
 for DIR in $DIRS; do
 	/bin/rm -rf $1/$DIR;
@@ -21,4 +21,21 @@ echo "Trimming wxWidgets translations..."
 # remove wxWidgets translations
 find $1/locale -name wxstd.mo -delete
 
+echo "Removing non-free code..."
+
+# remove non-free code (see BZ#894290)
+rm -vf samples/glut/glut.h
+rm -vf samples/glut/glut_roman.c
+rm -vf samples/glut/glut_stroke.c
+rm -vf samples/glut/glut_swidth.c
+rm -vf samples/glut/glutbitmap.h
+rm -vf samples/glut/glutint.h
+rm -vf samples/glut/glutstroke.h
+rm -vf samples/glut/glutwin32.h
+rm -vf samples/glut/win32_glx.c
+rm -vf samples/glut/win32_glx.h
+rm -vf samples/glut/win32_util.c
+rm -vf samples/glut/win32_x11.c
+rm -vf samples/glut/win32_x11.h
+
 echo "Done."