diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs
index c51e76d..ae8159e 100644
--- a/src/elan-dist/src/component/package.rs
+++ b/src/elan-dist/src/component/package.rs
@@ -56,6 +56,30 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)
         entry
             .unpack(&full_path)
             .chain_err(|| ErrorKind::ExtractingPackage)?;
+        nix_patch_if_needed(&full_path)?;
+    }
+
+    Ok(())
+}
+
+fn nix_patch_if_needed(dest_path: &Path) -> Result<()> {
+    let is_bin = matches!(dest_path.parent(), Some(p) if p.ends_with("bin"));
+    if is_bin {
+        let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
+            .arg("--set-interpreter")
+            .arg("@dynamicLinker@")
+            .arg(dest_path)
+            .output();
+    }
+
+    if dest_path.extension() == Some(::std::ffi::OsStr::new("lld")) {
+        use std::os::unix::fs::PermissionsExt;
+        let new_path = dest_path.with_extension("orig");
+        ::std::fs::rename(dest_path, &new_path)?;
+        ::std::fs::write(dest_path, format!(r#"#! @shell@
+exec -a "$0" {} "$@" --dynamic-linker=@dynamicLinker@
+"#, new_path.to_str().unwrap()))?;
+        ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?;
     }
 
     Ok(())