diff --git a/.github/labeler.yml b/.github/labeler.yml
index 90c25048299e8..99bdc3a1c97c4 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -34,9 +34,9 @@
         - nixos/modules/services/editors/emacs.nix
         - nixos/modules/services/editors/emacs.xml
         - nixos/tests/emacs-daemon.nix
+        - pkgs/applications/editors/emacs/build-support/**/*
         - pkgs/applications/editors/emacs/elisp-packages/**/*
         - pkgs/applications/editors/emacs/**/*
-        - pkgs/build-support/emacs/**/*
         - pkgs/top-level/emacs-packages.nix
 
 "6.topic: Enlightenment DE":
diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/applications/editors/emacs/build-support/buffer.nix
similarity index 100%
rename from pkgs/build-support/emacs/buffer.nix
rename to pkgs/applications/editors/emacs/build-support/buffer.nix
diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix
similarity index 100%
rename from pkgs/build-support/emacs/elpa.nix
rename to pkgs/applications/editors/emacs/build-support/elpa.nix
diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/applications/editors/emacs/build-support/elpa2nix.el
similarity index 100%
rename from pkgs/build-support/emacs/elpa2nix.el
rename to pkgs/applications/editors/emacs/build-support/elpa2nix.el
diff --git a/pkgs/build-support/emacs/emacs-funcs.sh b/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh
similarity index 100%
rename from pkgs/build-support/emacs/emacs-funcs.sh
rename to pkgs/applications/editors/emacs/build-support/emacs-funcs.sh
diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
similarity index 100%
rename from pkgs/build-support/emacs/generic.nix
rename to pkgs/applications/editors/emacs/build-support/generic.nix
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix
similarity index 100%
rename from pkgs/build-support/emacs/melpa.nix
rename to pkgs/applications/editors/emacs/build-support/melpa.nix
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/applications/editors/emacs/build-support/melpa2nix.el
similarity index 100%
rename from pkgs/build-support/emacs/melpa2nix.el
rename to pkgs/applications/editors/emacs/build-support/melpa2nix.el
diff --git a/pkgs/build-support/emacs/mk-wrapper-subdirs.el b/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el
similarity index 100%
rename from pkgs/build-support/emacs/mk-wrapper-subdirs.el
rename to pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el
diff --git a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch b/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch
similarity index 100%
rename from pkgs/build-support/emacs/package-build-dont-use-mtime.patch
rename to pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch
diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix
similarity index 100%
rename from pkgs/build-support/emacs/trivial.nix
rename to pkgs/applications/editors/emacs/build-support/trivial.nix
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix
similarity index 100%
rename from pkgs/build-support/emacs/wrapper.nix
rename to pkgs/applications/editors/emacs/build-support/wrapper.nix
diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/applications/editors/emacs/build-support/wrapper.sh
similarity index 100%
rename from pkgs/build-support/emacs/wrapper.sh
rename to pkgs/applications/editors/emacs/build-support/wrapper.sh
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
index 192320fab674d..f02b98e5f22dc 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
@@ -32,7 +32,7 @@ self: let
     });
   };
 
-  elpaBuild = import ../../../../build-support/emacs/elpa.nix {
+  elpaBuild = import ../build-support/elpa.nix {
     inherit lib stdenv texinfo writeText gcc;
     inherit (self) emacs;
   };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index 3e8ab4625fec2..4f3bdc44eb61b 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -32,7 +32,7 @@ self: let
     });
   };
 
-  elpaBuild = import ../../../../build-support/emacs/elpa.nix {
+  elpaBuild = import ../build-support/elpa.nix {
     inherit lib stdenv texinfo writeText gcc;
     inherit (self) emacs;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13e3e0892afeb..bcc500c81c125 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1288,7 +1288,10 @@ with pkgs;
 
   mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { };
 
-  nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; };
+  nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix {
+    inherit lib writeText;
+    inherit (emacs.pkgs) inherit-local;
+  };
 
   nix-gitignore = callPackage ../build-support/nix-gitignore { };
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index a14f53d535284..383ba5d73008e 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -47,7 +47,7 @@ let
     inherit lib pkgs;
   };
 
-  emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../build-support/emacs/wrapper.nix {
+  emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../applications/editors/emacs/build-support/wrapper.nix {
     inherit (pkgs.xorg) lndir;
     inherit lib;
   };
@@ -77,11 +77,11 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
       };
     });
 
-    trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix {
+    trivialBuild = pkgs.callPackage ../applications/editors/emacs/build-support/trivial.nix {
       inherit (self) emacs;
     };
 
-    melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix {
+    melpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/melpa.nix {
       inherit (self) emacs;
     };