diff --git a/pkgs/enigma.nix b/pkgs/enigma.nix
index 5b3ebfe..cff8462 100644
--- a/pkgs/enigma.nix
+++ b/pkgs/enigma.nix
@@ -22,8 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = with finalAttrs; ''
     runHook preInstall
 
-    mkdir -p $out/bin $out/share/${name}
-    cp ${src} $out/share/${name}/${name}.jar
+    install -Dm644 $src $out/share/${name}.jar
     makeWrapper ${jdk}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
 
     runHook postInstall
diff --git a/pkgs/openwebstart.nix b/pkgs/openwebstart.nix
index da68b09..e2f200b 100644
--- a/pkgs/openwebstart.nix
+++ b/pkgs/openwebstart.nix
@@ -8,7 +8,7 @@
   openjdk8,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  pname = "OpenWebStart";
+  pname = "openwebstart";
   version = "1.5.2";
 
   src = fetchurl {
@@ -18,21 +18,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [dpkg makeWrapper copyDesktopItems];
 
+  unpackCmd = "dpkg-deb -x $src .";
   sourceRoot = "opt/OpenWebStart";
 
-  unpackPhase = ''
-    runHook preUnpack
-
-    dpkg-deb -x $src .
-
-    runHook postUnpack
-  '';
-
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/lib
-    cp openwebstart.jar $out/lib/
+    install -Dm644 openwebstart.jar -t $out/lib
+
+    install -Dm644 App-Icon-512.png $out/share/pixmaps/openwebstart-settings.png
+    install -Dm644 Icon-512.png $out/share/pixmaps/openwebstart.png
 
     makeWrapper ${openjdk8}/bin/java $out/bin/openwebstart \
       --add-flags "-cp $out/lib/openwebstart.jar com.openwebstart.launcher.OpenWebStartLauncher"
@@ -40,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper ${openjdk8}/bin/java $out/bin/openwebstart-settings \
       --add-flags "-cp $out/lib/openwebstart.jar com.openwebstart.launcher.ControlPanelLauncher"
 
-    mkdir -p $out/share/pixmaps
-    cp App-Icon-512.png $out/share/pixmaps/openwebstart-settings.png
-    cp Icon-512.png $out/share/pixmaps/openwebstart.png
-
     runHook postInstall
   '';
 
diff --git a/pkgs/vineflower.nix b/pkgs/vineflower.nix
index a376c57..6456b94 100644
--- a/pkgs/vineflower.nix
+++ b/pkgs/vineflower.nix
@@ -20,8 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = with finalAttrs; ''
     runHook preInstall
 
-    mkdir -p $out/bin $out/share/${name}
-    cp ${src} $out/share/${name}/${name}.jar
+    install -Dm644 $src $out/share/${name}.jar
     makeWrapper ${jre_headless}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
 
     runHook postInstall