diff --git a/Docs/src/history.but b/Docs/src/history.but
index 184d42b9..4be1a842 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -40,6 +40,8 @@ Released on ? ?th, 2020
 
 \b Python 3 fixes (\W{http://sf.net/p/nsis/patches/296}{patch #296})
 
+\b GCC 10 memmove workaround (\W{http://sf.net/p/nsis/bugs/1248}{bug #1248})
+
 \H{v3.05} 3.05
 
 Released on December 15th, 2019
diff --git a/SCons/Config/gnu b/SCons/Config/gnu
index 1e6b509e..fa231c33 100644
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -103,6 +103,10 @@ stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG'])    # no standard libraries
 stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])        # 512 bytes align
 stub_env.Append(LINKFLAGS = ['$MAP_FLAG'])          # generate map file
 
+conf = FlagsConfigure(stub_env)
+conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns')  # GCC 10: Don't generate msvcrt!memmove calls (bug #1248)
+conf.Finish()
+
 stub_uenv = stub_env.Clone()
 stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])