diff --git a/pkgs/by-name/cr/crystal2nix/package.nix b/pkgs/by-name/cr/crystal2nix/package.nix
index 8232e8e42d7e..a9377b9e6cf9 100644
--- a/pkgs/by-name/cr/crystal2nix/package.nix
+++ b/pkgs/by-name/cr/crystal2nix/package.nix
@@ -2,29 +2,31 @@
   lib,
   fetchFromGitHub,
   crystal,
-  makeWrapper,
+  makeBinaryWrapper,
   nix-prefetch-git,
 }:
 
 crystal.buildCrystalPackage rec {
   pname = "crystal2nix";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
-    owner = "peterhoeg";
+    owner = "nix-community";
     repo = "crystal2nix";
     rev = "v${version}";
-    hash = "sha256-gb2vgKWVXwYWfUUcFvOLFF0qB4CTBekEllpyKduU1Mo=";
+    hash = "sha256-O8X2kTzl3LYMT97tVqbIZXDcFq24ZTfvd4yeMUhmBFs=";
   };
 
   format = "shards";
 
   shardsFile = ./shards.nix;
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
   postInstall = ''
-    wrapProgram $out/bin/crystal2nix \
+    mkdir -p $out/libexec
+    mv $out/bin/${meta.mainProgram} $out/libexec
+    makeWrapper $out/libexec/${meta.mainProgram} $out/bin/${meta.mainProgram} \
       --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git ]}
   '';
 
diff --git a/pkgs/by-name/cr/crystal2nix/shards.nix b/pkgs/by-name/cr/crystal2nix/shards.nix
index 728aefb80502..022832796a22 100644
--- a/pkgs/by-name/cr/crystal2nix/shards.nix
+++ b/pkgs/by-name/cr/crystal2nix/shards.nix
@@ -1,12 +1,7 @@
 {
-  spectator = {
+  "spectator" = {
     url = "https://gitlab.com/arctic-fox/spectator.git";
     rev = "v0.10.5";
     sha256 = "1fgjz5vg59h4m25v4fjklimcdn62ngqbchm00kw1160ggjpgpzw2";
   };
-  version_from_shard = {
-    url = "https://github.com/hugopl/version_from_shard.git";
-    rev = "v1.2.5";
-    sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik";
-  };
 }