diff --git a/pkgs/applications/networking/firehol/firehol-ping6.patch b/pkgs/by-name/fi/firehol/firehol-ping6.patch
similarity index 100%
rename from pkgs/applications/networking/firehol/firehol-ping6.patch
rename to pkgs/by-name/fi/firehol/firehol-ping6.patch
diff --git a/pkgs/applications/networking/firehol/firehol-sysconfdir.patch b/pkgs/by-name/fi/firehol/firehol-sysconfdir.patch
similarity index 100%
rename from pkgs/applications/networking/firehol/firehol-sysconfdir.patch
rename to pkgs/by-name/fi/firehol/firehol-sysconfdir.patch
diff --git a/pkgs/applications/networking/firehol/firehol-uname-command.patch b/pkgs/by-name/fi/firehol/firehol-uname-command.patch
similarity index 100%
rename from pkgs/applications/networking/firehol/firehol-uname-command.patch
rename to pkgs/by-name/fi/firehol/firehol-uname-command.patch
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/by-name/fi/firehol/package.nix
similarity index 100%
rename from pkgs/applications/networking/firehol/default.nix
rename to pkgs/by-name/fi/firehol/package.nix
diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/by-name/ip/iprange/package.nix
similarity index 100%
rename from pkgs/applications/networking/firehol/iprange.nix
rename to pkgs/by-name/ip/iprange/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7ccbe0f949d..2a45f25a0b4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2228,10 +2228,6 @@ with pkgs;
     buildProduct = "daemon";
   };
 
-  iprange = callPackage ../applications/networking/firehol/iprange.nix { };
-
-  firehol = callPackage ../applications/networking/firehol { };
-
   fluentd = callPackage ../tools/misc/fluentd { };
 
   fpm = callPackage ../tools/package-management/fpm { };