diff --git a/patches/gcc-3.4.6/gcc/config/m68k/amigaos.h b/patches/gcc-3.4.6/gcc/config/m68k/amigaos.h
index b1e2660..e33232e 100644
--- a/patches/gcc-3.4.6/gcc/config/m68k/amigaos.h
+++ b/patches/gcc-3.4.6/gcc/config/m68k/amigaos.h
@@ -147,7 +147,7 @@ Boston, MA 02111-1307, USA.  */
     "%{!resident:%{fbaserel:libnix/nbcrt0.o%s}%{!fbaserel:libnix/ncrt0.o%s}}}"
 
 #define ENDFILE_SPEC							\
-  "%{noixemul:-lstubs}"
+  "%{noixemul:-lstubs -lnix13}"
 
 /* Automatically search libamiga.a for AmigaOS specific functions.  Note
    that we first search the standard C library to resolve as much as
diff --git a/patches/gcc-3.4.6/gcc/cp/Make-lang.in.diff b/patches/gcc-3.4.6/gcc/cp/Make-lang.in.diff
new file mode 100755
index 0000000..9681eb5
--- /dev/null
+++ b/patches/gcc-3.4.6/gcc/cp/Make-lang.in.diff
@@ -0,0 +1,11 @@
+--- gcc-3.4.6/gcc/cp/Make-lang.in	1970-01-01 01:00:01.000000000 +0100
++++ gcc-3.4.6-patched/gcc/cp/Make-lang.in	1970-01-01 01:00:01.000000000 +0100
+@@ -94,6 +94,8 @@
+ $(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf
+ 	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
+ 		$(srcdir)/cp/cfns.gperf > $(srcdir)/cp/cfns.h
++	sed -i -- 's/__attribute__ ((__gnu_inline__))//g' $(srcdir)/cp/cfns.h
++	sed -i -- 's/__inline//g' $(srcdir)/cp/cfns.h
+ 
+ gtype-cp.h gt-cp-call.h gt-cp-decl.h gt-cp-decl2.h : s-gtype; @true
+ gt-cp-pt.h gt-cp-repo.h gt-cp-parser.h gt-cp-method.h : s-gtype; @true
diff --git a/submodules/libnix b/submodules/libnix
index 649b956..357f365 160000
--- a/submodules/libnix
+++ b/submodules/libnix
@@ -1 +1 @@
-Subproject commit 649b9564331bcf06975e7cdf455a0f46f6a5a4a4
+Subproject commit 357f36561d7b508c85cef73c4aeaabdf434a1bf9
diff --git a/toolchain-m68k b/toolchain-m68k
index 52ae566..de77f0c 100755
--- a/toolchain-m68k
+++ b/toolchain-m68k
@@ -559,7 +559,7 @@ def _build(pull):
 
 
   configure('{libnix}',
-            '--prefix={prefix}/{target}/libnix',
+            '--prefix={prefix}/{target}/libnix' if fill_in('{gcc}') == 'gcc-6' else '--prefix={prefix}/{target}',
             '--host=i686-linux-gnu',
             '--target=m68k-amigaos',
             from_dir='{submodules}/{libnix}')