diff --git a/.gitignore b/.gitignore
index 6f12cd3..add1368 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /gcc-11.0.0-20201204.tar.xz
 /gcc-11.0.0-20201216.tar.xz
 /gcc-11.0.0-20201217.tar.xz
+/gcc-11.0.0-20201223.tar.xz
diff --git a/gcc.spec b/gcc.spec
index e962506..8b6400d 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,5 +1,5 @@
-%global DATE 20201216
-%global gitrev ada196afb999077a634220ace175f349418e3078
+%global DATE 20201223
+%global gitrev 9265a9d6eb38913206ddc37009fd548c2e4f5de0
 %global gcc_version 11.0.0
 %global gcc_major 11
 # Note, gcc_release must be integer, if you want to add suffixes to
@@ -119,7 +119,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.10%{?dist}
+Release: %{gcc_release}.11%{?dist}
 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -274,7 +274,6 @@ Patch10: gcc11-rh1574936.patch
 Patch11: gcc11-d-shared-libphobos.patch
 Patch12: gcc11-pr98282.patch
 Patch13: gcc11-pr98338-workaround.patch
-Patch14: gcc11-c++tools.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -788,7 +787,6 @@ to NVidia PTX capable devices if available.
 %patch11 -p0 -b .d-shared-libphobos~
 %patch12 -p0 -b .pr98282~
 %patch13 -p0 -b .pr98338-workaround~
-%patch14 -p0 -b .c++tools~
 
 echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
 
@@ -3073,6 +3071,22 @@ end
 %endif
 
 %changelog
+* Wed Dec 23 2020 Jakub Jelinek <jakub@redhat.com> 11.0.0-0.11
+- update from trunk
+  - PRs bootstrap/98300, bootstrap/98380, bootstrap/98412, c++/67343,
+	c++/93480, c++/96840, c++/98340, c++/98343, c++/98353, c++/98383,
+	c/98047, c/98260, d/98067, fortran/83118, fortran/92587,
+	fortran/96012, fortran/98284, fortran/98307, go/98402,
+	libstdc++/46447, libstdc++/93151, libstdc++/96083, libstdc++/98319,
+	libstdc++/98344, libstdc++/98370, libstdc++/98374, libstdc++/98377,
+	middle-end/98366, other/98400, other/98409, rtl-optimization/98271,
+	rtl-optimization/98276, rtl-optimization/98289,
+	rtl-optimization/98347, sanitizer/97868, target/96793, target/98146,
+	target/98177, target/98280, tree-optimization/96239,
+	tree-optimization/97750, tree-optimization/98272,
+	tree-optimization/98279, tree-optimization/98378,
+	tree-optimization/98407
+
 * Thu Dec 17 2020 Jakub Jelinek <jakub@redhat.com> 11.0.0-0.10
 - apply workaround for profiledbootstrap x86_64 failure
 - put g++-mapper-server into the right directory
diff --git a/gcc11-c++tools.patch b/gcc11-c++tools.patch
deleted file mode 100644
index 563b404..0000000
--- a/gcc11-c++tools.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-2020-12-17  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.ac: Add GCC_BASE_VER.
-	* Makefile.in (version): Remove variable.
-	(gcc_version): New variable.
-	(libexecsubdir): Use $(gcc_version) instead of $(version).
-	* configure: Regenerated.
-
---- c++tools/configure.ac.jj	2020-12-16 23:38:34.091923526 +0100
-+++ c++tools/configure.ac	2020-12-17 00:02:48.221661922 +0100
-@@ -206,6 +206,9 @@ if test $ac_cv_inet_ntop = yes; then
-   [Define if inet_ntop provided.])
- fi
- 
-+# Determine what GCC version number to use in filesystem paths.
-+GCC_BASE_VER
-+
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_FILES([Makefile])
- 
---- c++tools/Makefile.in.jj	2020-12-16 23:38:34.091923526 +0100
-+++ c++tools/Makefile.in	2020-12-17 00:01:54.419263424 +0100
-@@ -20,8 +20,8 @@ prefix := @prefix@
- bindir := @bindir@
- libexecdir := @libexecdir@
- target_noncanonical := @target_noncanonical@
--version := $(shell cat $(srcdir)/../gcc/BASE-VER)
--libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(version)
-+gcc_version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER)
-+libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
- INSTALL := @INSTALL@
- AUTOCONF := @AUTOCONF@
- AUTOHEADER := @AUTOHEADER@
---- c++tools/configure.jj	2020-12-16 23:38:34.091923526 +0100
-+++ c++tools/configure	2020-12-17 00:02:53.849599006 +0100
-@@ -585,6 +585,7 @@ ac_unique_file="c++tools"
- ac_unique_file="server.cc"
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
-+get_gcc_base_ver
- ac_ct_CC
- CFLAGS
- CC
-@@ -658,6 +659,7 @@ ac_user_opts='
- enable_option_checking
- enable_c___tools
- enable_maintainer_mode
-+with_gcc_major_version_only
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1287,6 +1289,12 @@ Optional Features:
-                           enable maintainer mode. Add rules to rebuild
-                           configurey bits
- 
-+Optional Packages:
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-gcc-major-version-only
-+                          use only GCC major number in filesystem paths
-+
- Some influential environment variables:
-   CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-@@ -3557,6 +3565,21 @@ $as_echo "#define HAVE_INET_NTOP 1" >>co
- 
- fi
- 
-+# Determine what GCC version number to use in filesystem paths.
-+
-+  get_gcc_base_ver="cat"
-+
-+# Check whether --with-gcc-major-version-only was given.
-+if test "${with_gcc_major_version_only+set}" = set; then :
-+  withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then
-+        get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'"
-+      fi
-+
-+fi
-+
-+
-+
-+
- ac_config_headers="$ac_config_headers config.h"
- 
- ac_config_files="$ac_config_files Makefile"
diff --git a/sources b/sources
index 4697e55..7997ecd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (gcc-11.0.0-20201216.tar.xz) = 5624f905eafa693434ca16df9df9b3d7dff6d01d335fb690bee124d5f62cec6f2273a4b13cbe85eac33b00d2e556bfeb246444558c4a33747629529a2bd560ad
+SHA512 (gcc-11.0.0-20201223.tar.xz) = 46bd2b601027ce420d5659e0e8638f9f3971eaf637960db9aced7a335ea234b761ae5b671ffc1fcee772c804cbdf9058346f461ad360019777feca89491afdd9
 SHA512 (newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz) = 002a48a7b689a81abbf16161bcaec001a842e67dfbe372e9e109092703bfc666675f16198f60ca429370e8850d564547dc505df81bc3aaca4ce6defbc014ad6c
 SHA512 (nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz) = f6d10db94fa1570ae0f94df073fa3c73c8e5ee16d59070b53d94f7db0de8a031bc44d7f3f1852533da04b625ce758e022263855ed43cfc6867e0708d001e53c7