diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix
new file mode 100644
index 000000000000..81a6b540f232
--- /dev/null
+++ b/pkgs/by-name/ac/activemq/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+}:
+
+let
+  version = "6.1.3";
+in
+stdenvNoCC.mkDerivation {
+  pname = "activemq";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz";
+    hash = "sha256-ytFOgW6ZDxMScJ6/wij0KJXYxUxlLTzVbwtRRWNdx5Q=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv * $out/
+    for j in $(find $out/lib -name "*.jar"); do
+      cp="''${cp:+"$cp:"}$j";
+    done
+    echo "CLASSPATH=$cp" > $out/lib/classpath.env
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://activemq.apache.org/";
+    description = "Messaging and Integration Patterns server written in Java";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.asl20;
+    mainProgram = "activemq";
+    maintainers = [ lib.maintainers.anthonyroussel ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
deleted file mode 100644
index 5543c12ac9ed..000000000000
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "apache-activemq";
-  version = "6.1.2";
-
-  src = fetchurl {
-    sha256 = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0=";
-    url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
-  };
-
-  installPhase = ''
-    mkdir -p $out
-    mv * $out/
-    for j in `find $out/lib -name "*.jar"`; do
-      cp="''${cp:+"$cp:"}$j";
-    done
-    echo "CLASSPATH=$cp" > $out/lib/classpath.env
-  '';
-
-  meta = {
-    homepage = "https://activemq.apache.org/";
-    description = "Messaging and Integration Patterns server written in Java";
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29b0ddf7bb68..f80f2ded90e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18944,8 +18944,6 @@ with pkgs;
 
   acsccid = callPackage ../tools/security/acsccid { };
 
-  activemq = callPackage ../development/libraries/apache-activemq { };
-
   adns = callPackage ../development/libraries/adns { };
 
   adslib = callPackage ../development/libraries/adslib { };