diff --git a/satellites/functions/download/git.sh b/satellites/functions/download/git.sh
index 18022ab..8017c2d 100644
--- a/satellites/functions/download/git.sh
+++ b/satellites/functions/download/git.sh
@@ -1,10 +1,15 @@
 download_git() {
-    if [ ! -d "$dir_source/$name/$2" ]; then
-        rm -rf "$dir_source/$name/$2"
-        git clone --recursive --depth=1 -b "$2" "$1" "$dir_source/$name/$2"
+    _func_reponame="$(basename "$1")"
+    _func_dir="$dir_source/$name/$_func_reponame-$2"
+
+    if [ ! -d "$_func_dir" ]; then
+        rm -rf "$_func_dir"
+        git clone --recursive --depth=1 -b "v$2" "$1" "$_func_dir"
     else
-        cd "$dir_source/$name/$2"
-        git checkout "tags/$2"
+        cd "$_func_dir"
+        git checkout "tags/v$2"
         cd "$OLDPWD"
     fi
+
+    getfile "$_func_reponame-$2"
 }
diff --git a/satellites/heimdall.sat b/satellites/heimdall.sat
new file mode 100644
index 0000000..a374340
--- /dev/null
+++ b/satellites/heimdall.sat
@@ -0,0 +1,18 @@
+import "compile/configure"
+
+name=Heimdall
+version=1.4.1
+update_url="https://github.com/Benjamin-Dobell/$name/releases"
+
+dlextract "https://github.com/Benjamin-Dobell/$name/archive/v$version.tar.gz" \
+          "22c911e9042f5ed8fd90cbeeb9589015"
+header_end
+
+cd "$name-$version/libpit"
+./configure
+make
+
+cd "../heimdall"
+compile_configure
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/qwbfsmanager.sat b/satellites/qwbfsmanager.sat
index 2078a46..3af3163 100644
--- a/satellites/qwbfsmanager.sat
+++ b/satellites/qwbfsmanager.sat
@@ -8,10 +8,10 @@ update_url="https://github.com/pasnox/$name/releases"
 update_names="v$version.tar.gz"
 
 # Downloading this way to get dependencies.
-download_git "https://github.com/pasnox/$name" "v$version"
+download_git "https://github.com/pasnox/$name" "$version"
 header_end
 
-getfile "v$version"; cd "v$version"
+cd "$name-$version"
 sed -i -e "s/CONFIG \*= fresh//" qwbfs.pro qwbfs/qwbfs.pro  # Make sure we always use the bundled library.
 
 compile_qt 5