diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/by-name/mr/mrrescue/package.nix
similarity index 60%
rename from pkgs/games/mrrescue/default.nix
rename to pkgs/by-name/mr/mrrescue/package.nix
index c42364f0d71d..48052f53b47b 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/pkgs/by-name/mr/mrrescue/package.nix
@@ -1,17 +1,17 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
   fetchurl,
   love,
   lua,
   makeWrapper,
   makeDesktopItem,
+  strip-nondeterminism,
+  zip,
 }:
 
 let
-  pname = "mrrescue";
-  version = "1.02d";
-
   icon = fetchurl {
     url = "http://tangramgames.dk/img/thumb/mrrescue.png";
     sha256 = "1y5ahf0m01i1ch03axhvp2kqc6lc1yvh59zgvgxw4w7y3jryw20k";
@@ -19,7 +19,7 @@ let
 
   desktopItem = makeDesktopItem {
     name = "mrrescue";
-    exec = pname;
+    exec = "mrrescue";
     icon = icon;
     comment = "Arcade-style fire fighting game";
     desktopName = "Mr. Rescue";
@@ -30,30 +30,40 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  pname = "mrrescue";
+  version = "1.02d-unstable-2018-08-18";
 
-  src = fetchurl {
-    url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love";
-    sha256 = "0kzahxrgpb4vsk9yavy7f8nc34d62d1jqjrpsxslmy9ywax4yfpi";
+  src = fetchFromGitHub {
+    owner = "SimonLarsen";
+    repo = "mrrescue";
+    rev = "a5be73c60acb8d1be506f7b5e48e784492ba96ce";
+    hash = "sha256-UDfMgE7LyyXioURclA56Kx+bTrwMNDPR3evCRJ3reRM=";
   };
 
   nativeBuildInputs = [
     lua
     love
     makeWrapper
+    strip-nondeterminism
+    zip
   ];
 
-  dontUnpack = true;
+  buildPhase = ''
+    runHook preBuild
+    zip -9 -r mrrescue.love ./*
+    strip-nondeterminism --type zip mrrescue.love
+    runHook postBuild
+  '';
 
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/share/games/lovegames
 
-    cp -v $src $out/share/games/lovegames/${pname}.love
+    cp -v mrrescue.love $out/share/games/lovegames/mrrescue.love
 
-    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+    makeWrapper ${love}/bin/love $out/bin/mrrescue --add-flags $out/share/games/lovegames/mrrescue.love
 
-    chmod +x $out/bin/${pname}
+    chmod +x $out/bin/mrrescue
     mkdir -p $out/share/applications
     ln -s ${desktopItem}/share/applications/* $out/share/applications/
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37c855b8c601..d0aecbd357ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13521,8 +13521,6 @@ with pkgs;
   luanti-client = luanti.override { buildServer = false; };
   luanti-server = luanti.override { buildClient = false; };
 
-  mrrescue = callPackage ../games/mrrescue { love = love_0_10; };
-
   mudlet = libsForQt5.callPackage ../games/mudlet {
     lua = lua5_1;
   };