diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in
index afc87d07ad9..83a6ae54c29 100644
--- a/c++tools/Makefile.in
+++ b/c++tools/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for c++tools
-#   Copyright 2020 Free Software Foundation, Inc.
+#   Copyright (C) 2020-2021 Free Software Foundation, Inc.
 #
 # This file 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/c++tools/configure.ac b/c++tools/configure.ac
index 5771f2ace68..1b08f7575b6 100644
--- a/c++tools/configure.ac
+++ b/c++tools/configure.ac
@@ -1,5 +1,5 @@
 # Configure script for c++tools
-#   Copyright (C) 2020 Free Software Foundation, Inc.
+#   Copyright (C) 2020-2021 Free Software Foundation, Inc.
 #   Written by Nathan Sidwell <nathan@acm.org> while at FaceBook
 #
 # This file is free software; you can redistribute it and/or modify it
diff --git a/c++tools/resolver.cc b/c++tools/resolver.cc
index ef08de53072..edd4624b121 100644
--- a/c++tools/resolver.cc
+++ b/c++tools/resolver.cc
@@ -1,5 +1,5 @@
 /* C++ modules.  Experimental!	-*- c++ -*-
-   Copyright (C) 2017-2020 Free Software Foundation, Inc.
+   Copyright (C) 2017-2021 Free Software Foundation, Inc.
    Written by Nathan Sidwell <nathan@acm.org> while at FaceBook
 
    This file is part of GCC.
diff --git a/c++tools/resolver.h b/c++tools/resolver.h
index a9547bf6994..b2f4381b4fa 100644
--- a/c++tools/resolver.h
+++ b/c++tools/resolver.h
@@ -1,5 +1,5 @@
 /* C++ modules.  Experimental!	-*- c++ -*-
-   Copyright (C) 2017-2020 Free Software Foundation, Inc.
+   Copyright (C) 2017-2021 Free Software Foundation, Inc.
    Written by Nathan Sidwell <nathan@acm.org> while at FaceBook
 
    This file is part of GCC.
diff --git a/c++tools/server.cc b/c++tools/server.cc
index 21c7d468aa0..709955e7e2b 100644
--- a/c++tools/server.cc
+++ b/c++tools/server.cc
@@ -1,5 +1,5 @@
 /* C++ modules.  Experimental!
-   Copyright (C) 2018-2020 Free Software Foundation, Inc.
+   Copyright (C) 2018-2021 Free Software Foundation, Inc.
    Written by Nathan Sidwell <nathan@acm.org> while at FaceBook
 
    This file is part of GCC.
@@ -290,7 +290,7 @@ static void ATTRIBUTE_NORETURN
 print_version (void)
 {
   fnotice (stdout, "%s %s%s\n", progname, pkgversion_string, version_string);
-  fprintf (stdout, "Copyright %s 2018-2020 Free Software Foundation, Inc.\n",
+  fprintf (stdout, "Copyright %s 2018-2021 Free Software Foundation, Inc.\n",
 	   ("(C)"));
   fnotice (stdout,
 	   ("This is free software; see the source for copying conditions.\n"
diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py
index 83c761acc55..2b2bb11d2e6 100755
--- a/contrib/update-copyright.py
+++ b/contrib/update-copyright.py
@@ -735,6 +735,7 @@ class GCCCmdLine (CmdLine):
 
         self.add_dir ('.', TopLevelFilter())
         # boehm-gc is imported from upstream.
+        self.add_dir ('c++tools')
         self.add_dir ('config', ConfigFilter())
         # contrib isn't really part of GCC.
         self.add_dir ('fixincludes')
@@ -770,6 +771,7 @@ class GCCCmdLine (CmdLine):
         # zlib is imported from upstream.
 
         self.default_dirs = [
+            'c++tools',
             'gcc',
             'include',
             'libada',