diff -Nru qutemol-0.4.1~cvs20081111/debian/changelog qutemol-0.4.1~cvs20081111/debian/changelog
--- qutemol-0.4.1~cvs20081111/debian/changelog	2016-07-20 15:02:00.000000000 +0000
+++ qutemol-0.4.1~cvs20081111/debian/changelog	2016-09-25 13:15:21.000000000 +0000
@@ -1,3 +1,10 @@
+qutemol (0.4.1~cvs20081111-6+rpi1) stretch-staging; urgency=medium
+
+  * Build mytab.o, main.o and wx_trackball.o with std=gnu11 to work arround build failure.
+  * add some includes to main.c to work arround assert macro errors.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 25 Sep 2016 13:15:21 +0000
+
 qutemol (0.4.1~cvs20081111-6) unstable; urgency=medium
 
   * Add -std=gnu++98 to CXXFLAGS to fix FTBFS with GCC6,
diff -Nru qutemol-0.4.1~cvs20081111/debian/control qutemol-0.4.1~cvs20081111/debian/control
--- qutemol-0.4.1~cvs20081111/debian/control	2016-07-20 15:02:00.000000000 +0000
+++ qutemol-0.4.1~cvs20081111/debian/control	2016-09-25 13:15:21.000000000 +0000
@@ -10,7 +10,9 @@
                libgif-dev (>= 5),
                libglew1.5-dev,
                libpng-dev,
-               libwxgtk3.0-dev
+               libwxgtk3.0-dev,
+               gcc-5,
+               g++-5
 Standards-Version: 3.9.8
 Homepage: http://qutemol.sourceforge.net/
 Vcs-Browser: https://anonscm.debian.org/viewvc/debichem/unstable/qutemol/
diff -Nru qutemol-0.4.1~cvs20081111/debian/patches/99_raspbian.patch qutemol-0.4.1~cvs20081111/debian/patches/99_raspbian.patch
--- qutemol-0.4.1~cvs20081111/debian/patches/99_raspbian.patch	1970-01-01 00:00:00.000000000 +0000
+++ qutemol-0.4.1~cvs20081111/debian/patches/99_raspbian.patch	2016-09-25 13:15:21.000000000 +0000
@@ -0,0 +1,65 @@
+Description:  
+ Build mytab.o, main.0, wx_trackball.o, progress.o and saveSnapDialog.o with std=gnu11 to work arround build failure.
+ include "<algorithm>" and "<map>" at the top of main.cpp to work
+ arround assert macro issue.
+ include "<algorithm>" and "<map>"  at the top of wx_trackball.cpp to work
+ arround assert macro issue.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: qutemol-0.4.1~cvs20081111/Makefile
+===================================================================
+--- qutemol-0.4.1~cvs20081111.orig/Makefile
++++ qutemol-0.4.1~cvs20081111/Makefile
+@@ -37,15 +37,27 @@ src/CgUtil.o: src/CgUtil.cpp
+ src/Common.o: src/Common.cpp
+ src/HardSettings.o: src/HardSettings.cpp
+ src/Mol.o:  src/Mol.cpp
++
+ src/MyTab.o: src/MyTab.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=gnu++11 -c src/MyTab.cpp -o src/MyTab.o
++
+ src/Sampling.o: src/Sampling.cpp
+ src/ShadowMap.o: src/ShadowMap.cpp
++
+ src/main.o: src/main.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=gnu++11 -c src/main.cpp -o src/main.o
++
+ src/wx_trackball.o: src/wx_trackball.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=gnu++11 -c src/wx_trackball.cpp -o src/wx_trackball.o
++
+ vcg/wrap/gui/trackball.o: vcg/wrap/gui/trackball.cpp
+ vcg/wrap/gui/trackmode.o: vcg/wrap/gui/trackmode.cpp
+ src/progress.o: src/progress.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=gnu++11 -c src/progress.cpp -o src/progress.o
++
+ src/MyCanvas.o: src/MyCanvas.cpp
+ src/saveSnapDialog.o:  src/saveSnapDialog.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=gnu++11 -c src/saveSnapDialog.cpp -o src/saveSnapDialog.o
++
+ src/gifSave.o: src/gifSave.cpp
+ src/pngSave.o: src/pngSave.cpp
+Index: qutemol-0.4.1~cvs20081111/src/main.cpp
+===================================================================
+--- qutemol-0.4.1~cvs20081111.orig/src/main.cpp
++++ qutemol-0.4.1~cvs20081111/src/main.cpp
+@@ -5,6 +5,9 @@
+ //
+ ////////////////////////////////////////////////////////////////////
+ 
++#include <algorithm>
++#include <map>
++
+ #define SnapButton 1
+ #define OpenButton 2
+ #define QuitButton 3
+Index: qutemol-0.4.1~cvs20081111/src/wx_trackball.cpp
+===================================================================
+--- qutemol-0.4.1~cvs20081111.orig/src/wx_trackball.cpp
++++ qutemol-0.4.1~cvs20081111/src/wx_trackball.cpp
+@@ -1,4 +1,5 @@
+-
++#include <algorithm>
++#include <map>
+ 
+ #include <wx/defs.h>
+ #include <wx/app.h>
diff -Nru qutemol-0.4.1~cvs20081111/debian/patches/series qutemol-0.4.1~cvs20081111/debian/patches/series
--- qutemol-0.4.1~cvs20081111/debian/patches/series	2016-07-20 14:50:00.000000000 +0000
+++ qutemol-0.4.1~cvs20081111/debian/patches/series	2016-09-25 13:15:21.000000000 +0000
@@ -37,3 +37,4 @@
 37_giflib5.patch
 38_libpng15.patch
 39_reproducible_build.patch
+99_raspbian.patch