diff --git a/lib/maintainers/maintainer-list.nix b/lib/maintainers/maintainer-list.nix
index a324399d..d7f1d86a 100644
--- a/lib/maintainers/maintainer-list.nix
+++ b/lib/maintainers/maintainer-list.nix
@@ -45,6 +45,10 @@ Please keep the list alphabetically sorted.
 See `<nixpkgs/maintainers/scripts/check-maintainer-github-handles.sh>` for an example on how to work with this data.
 */
 {
+  agaget = {
+    email = "alexis.gaget@cea.fr";
+    name = "Alexis Gaget";
+  };
   minijackson = {
     email = "remi.nicole@cea.fr";
     name = "Rémi Nicole";
@@ -62,8 +66,4 @@ See `<nixpkgs/maintainers/scripts/check-maintainer-github-handles.sh>` for an ex
     email = "stephane.tzvetkov@cea.fr";
     name = "Stéphane Tzvetkov";
   };
-  agaget = {
-    email = "alexis.gaget@cea.fr";
-    name = "Alexis Gaget";
-  };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4382fb9c..adf63a10 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -32,6 +32,7 @@ in
         epics-systemd = callPackage ./epnix/support/epics-systemd {};
         ipac = callPackage ./epnix/support/ipac {};
         modbus = callPackage ./epnix/support/modbus {};
+        mrfioc2 = callPackage ./epnix/support/mrfioc2 {};
         pvxs = callPackage ./epnix/support/pvxs {};
         seq = callPackage ./epnix/support/seq {};
         snmp = callPackage ./epnix/support/snmp {};
diff --git a/pkgs/epnix/support/mrfioc2/default.nix b/pkgs/epnix/support/mrfioc2/default.nix
new file mode 100644
index 00000000..a424cce0
--- /dev/null
+++ b/pkgs/epnix/support/mrfioc2/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  epnix,
+  epnixLib,
+  mkEpicsPackage,
+  fetchFromGitHub,
+  fetchpatch,
+  local_config_site ? {},
+  local_release ? {},
+}:
+mkEpicsPackage rec {
+  pname = "mrfioc2";
+  version = "2.6.0";
+  varname = "MRFIOC2";
+
+  inherit local_config_site local_release;
+
+  src = fetchFromGitHub {
+    owner = "epics-modules";
+    repo = "mrfioc2";
+    rev = version;
+    sha256 = "sha256-pmuM4HrHlZ63BcZACZOlMAPic1IOQ/kLpi9lo/raP0U=";
+  };
+
+  propagatedBuildInputs = with epnix.support; [devlib2];
+
+  postInstall = ''
+    if [[ -d iocBoot ]]; then
+      cp -rafv iocBoot -t "$out"
+    fi
+  '';
+
+  meta = {
+    description = "Driver EPICS for MRF cards";
+    homepage = "https://github.com/epics-modules/mrfioc2";
+    license = epnixLib.licenses.epics;
+    maintainers = with epnixLib.maintainers; [agaget];
+  };
+}