diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9937912ec3e5..905cf761aa40 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -233,6 +233,7 @@
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mog = "Matthew O'Gorman <mog-lists@rldn.net>";
+  moretea = "Maarten Hoogendoorn <maarten@moretea.nl>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   MP2E = "Cray Elliott <MP2E@archlinux.us>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
new file mode 100644
index 000000000000..c8493b594690
--- /dev/null
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost,
+ python27, python27Packages}:
+
+stdenv.mkDerivation rec {
+  version = "201409.1";
+  build_nr = "13892";
+  name = "mcrl2-${version}";
+
+  src = fetchurl {
+    url = "http://www.mcrl2.org/download/devel/mcrl2-${version}.${build_nr}.tar.gz";
+    sha256 = "0cknpind6rma12q93rbm638ijhy8sj8nd20wnw8l0f651wm0x036";
+  };
+
+  buildInputs = [ xlibs.libX11 cmake subversion mesa qt5.qtbase boost
+                  python27 python27Packages.pyyaml python27Packages.psutil ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A toolset for model-checking concurrent systems and protocols";
+    longDescription = ''
+      A formal specification language with an associated toolset,
+      that can be used for modelling, validation and verification of
+      concurrent systems and protocols
+    '';
+    homepage = http://www.mcrl2.org/;
+    license = licenses.boost;
+    maintainers = with maintainers; [ moretea ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/misc/mcrl2/default.nix b/pkgs/tools/misc/mcrl2/default.nix
deleted file mode 100644
index a67081d5ef21..000000000000
--- a/pkgs/tools/misc/mcrl2/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, mesa, wxGTK, libX11}:
-
-stdenv.mkDerivation {
-  name = "mcrl2-200901";
-  src = fetchurl {
-    url = http://www.win.tue.nl/mcrl2/download/release/mcrl2-200901-src.tar.bz2 ;
-    sha256 = "0lji31d7dv15q8092b8g01j023dd7miq3nw8klgc8jd136xpwdp9";
-  };
-
-  buildInputs = [ mesa wxGTK libX11 ] ;
-}
-
-
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 188788955ffe..76e9d5d2ec91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -782,8 +782,6 @@ in
 
   mcrl = callPackage ../tools/misc/mcrl { };
 
-  mcrl2 = callPackage ../tools/misc/mcrl2 { };
-
   meson = callPackage ../development/tools/build-managers/meson { };
 
   mp3fs = callPackage ../tools/filesystems/mp3fs { };
@@ -15768,6 +15766,8 @@ in
 
   metis-prover = callPackage ../applications/science/logic/metis-prover { };
 
+  mcrl2 = callPackage ../applications/science/logic/mcrl2 { };
+
   minisat = callPackage ../applications/science/logic/minisat {};
 
   opensmt = callPackage ../applications/science/logic/opensmt { };