2 files changed, 22 insertions, 2 deletions

diff --git a/CODEOWNERS b/CODEOWNERS
index fe218630cab..8f0acc89337 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -27,6 +27,14 @@ gnu/packages/bootstrap\.scm                        @guix/bootstrap
 gnu/packages/commencement\.scm                     @guix/bootstrap
 gnu/packages/mes\.scm                              @guix/bootstrap
 
+gnu/packages/assembly\.scm                         @guix/build-tools
+gnu/packages/autogen\.scm                          @guix/build-tools
+gnu/packages/autotools\.scm                        @guix/build-tools
+gnu/packages/bison\.scm                            @guix/build-tools
+gnu/packages/m4\.scm                               @guix/build-tools
+gnu/packages/oyacc\.scm                            @guix/build-tools
+gnu/packages/re2c\.scm                             @guix/build-tools
+
 gnu/build-system/cmake\.scm                        @guix/cpp
 gnu/build/cmake-build-system\.scm                  @guix/cpp
 gnu/packages/c\.scm                                @guix/cpp
diff --git a/etc/teams.scm b/etc/teams.scm
index 2c4809e933c..6730a910088 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -504,6 +504,18 @@ of Rebar and Mix build systems and Hex.pm importer."
                       "gnu/packages/commencement.scm"
                       "gnu/packages/mes.scm")))
 
+(define-team build-tools
+  (team 'build-tools
+        #:name "Build tools team"
+        #:description "Build tools and parser generators."
+        #:scope (list "gnu/packages/assembly.scm"
+                      "gnu/packages/autogen.scm"
+                      "gnu/packages/autotools.scm"
+                      "gnu/packages/bison.scm"
+                      "gnu/packages/m4.scm"
+                      "gnu/packages/oyacc.scm"
+                      "gnu/packages/re2c.scm")))
+
 (define-team c++
   (team 'c++
         #:name "C/C++ team"
@@ -1396,7 +1408,7 @@ the \"texlive\" importer."
 (define-member (person "Janneke Nieuwenhuizen"
                        "janneke@gnu.org"
                        "janneke")
-  bootstrap core-packages home hurd installer qa-packages)
+  bootstrap build-tools core-packages home hurd installer qa-packages)
 
 (define-member (person "Ian Eure"
                        "ian@retrospec.tv"
@@ -1515,7 +1527,7 @@ the \"texlive\" importer."
 (define-member (person "Nguyễn Gia Phong"
                        "cnx@loang.net"
                        "cnx")
-  python qa-packages sysadmin)
+  build-tools python qa-packages sysadmin)
 
 (define-member (person "Lilah Tascheter"
                        "lilah@lunabee.space"