diff --git a/build/pan-run.sh b/build/pan-run.sh
index c933a38039e..1d9db537765 100755
--- a/build/pan-run.sh
+++ b/build/pan-run.sh
@@ -4,4 +4,7 @@ export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/
 
 ldd $pan/bin/pan
 
-$pan/bin/pan $*
\ No newline at end of file
+prog=$1
+shift
+
+$pan/bin/$prog $*
diff --git a/tmpl/pan-0.13.91-run.nix b/tmpl/pan-0.13.91-run.nix
index a28459916cd..f9c13e64d71 100644
--- a/tmpl/pan-0.13.91-run.nix
+++ b/tmpl/pan-0.13.91-run.nix
@@ -1,4 +1,4 @@
-id : pan-0.13.91-run
+id : pan-0.13.91-run-2
 
 pan <- ./pan-0.13.91.nix