diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 80112755e6d..a822ad989ac 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -50,6 +50,10 @@ self: super:
     hardeningDisable = [ "format" ];
   });
 
+  fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
+    meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
+  });
+
   fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
     postInstall =
       ''
@@ -866,41 +870,3 @@ self: super:
   });
 
 }
-
-# mark some packages as unfree
-// (
-  let
-    # unfree but redistributable
-    redist = [
-      "fontadobeutopiatype1"
-      "fontadobeutopia100dpi"
-      "fontadobeutopia75dpi"
-      "fontbhtype1"
-      "fontibmtype1"
-      "fontbhttf"
-      "fontbh100dpi"
-      "fontbh75dpi"
-    ];
-
-    # unfree, possibly not redistributable
-    unfree = [
-      # no license, just a copyright notice
-      "fontbhlucidatypewriter100dpi"
-      "fontbhlucidatypewriter75dpi"
-      "fontdaewoomisc"
-
-      # unclear license, "permission to use"?
-      "fontjismisc"
-    ];
-
-    setLicense = license: name:
-      super.${name}.overrideAttrs (attrs: {
-        meta = attrs.meta // { inherit license; };
-      });
-    mapNamesToAttrs = f: names: with lib;
-      listToAttrs (zipListsWith nameValuePair names (map f names));
-
-  in
-    mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist //
-    mapNamesToAttrs (setLicense lib.licenses.unfree) unfree
-)