diff --git a/config/rootfiles/oldcore/149/update.sh b/config/rootfiles/oldcore/149/update.sh
index 50add169b..38f80529f 100644
--- a/config/rootfiles/oldcore/149/update.sh
+++ b/config/rootfiles/oldcore/149/update.sh
@@ -43,6 +43,9 @@ extract_files
 # update linker config
 ldconfig
 
+# Restart init to allow clean unmout at reboot
+telinit u
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
diff --git a/lfs/binutils b/lfs/binutils
index 334adad25..6db2e990f 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -51,6 +51,8 @@ ifeq "$(PASS)" "1"
   CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
   CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
   CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+  CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
 
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
diff --git a/lfs/ccache b/lfs/ccache
index 94d7bd149..1361f3ed0 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -34,10 +34,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 
 ifeq "$(PASS)" "1"
 	CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+	CFLAGS := $(patsubst -mtune=%,,$(CFLAGS))
 	CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
 	CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 	CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
 	CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+	CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+	CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
 endif
 
 ###############################################################################
diff --git a/lfs/gcc b/lfs/gcc
index 7cbc8e9e8..3aa147ce8 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -44,6 +44,8 @@ CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
 ifeq "$(PASS)" "1"
 CFLAGS    := $(patsubst -mindirect-branch=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfunction-return=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+CFLAGS    := $(patsubst -fcf-protection,,$(CFLAGS))
 endif
 
 CXXFLAGS  := $(CFLAGS)
diff --git a/lfs/glibc b/lfs/glibc
index 802c372a9..281c290dc 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
diff --git a/make.sh b/make.sh
index 4a9dd3cb6..33c5de5cd 100755
--- a/make.sh
+++ b/make.sh
@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"			# Git Branch
 GIT_TAG="$(git tag | tail -1)"					# Git Tag
 GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"			# Last commit
 
-TOOLCHAINVER=20200814
+TOOLCHAINVER=20200924
 
 ###############################################################################
 #
@@ -153,7 +153,7 @@ configure_build() {
 			BUILDTARGET="${build_arch}-pc-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer -fcf-protection"
+			CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
 			;;
 
 		aarch64)