diff --git a/package.sh b/package.sh
index 92bc5a8..3f229f9 100755
--- a/package.sh
+++ b/package.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 # This script packages sshyp (from source) for various Linux environments.
 
 # NOTE It is recommended to instead use the latest officially packaged and tagged release.
@@ -6,26 +7,61 @@
 # NOTE As of release fr4, sshync will become a separate package and thus a dependency for sshyp. sshync is automatically installed with the PKGBUILD version.
 
 echo -e '\nOptions (please enter the number only):'
-echo -e '\nDistribution Packages:\n\n1. Debian Linux\n2. Termux\n3. Generic (used for PKGBUILD/APKBUILD)'
-echo -e '\nBuild Scripts:\n\n4. Alpine Linux (APKBUILD)\n5. Arch Linux (PKGBUILD)'
+echo -e '\nDistribution Packages:\n\n1. Debian\n2. Termux\n3. Generic (used for PKGBUILD/APKBUILD)'
+echo -e '\nBuild Scripts:\n\n4. Alpine Linux (APKBUILD)\n5. Arch Linux (PKGBUILD, also builds local generic package)'
 echo -e '\nOther:\n\n6. All (generates all distribution packages and build scripts)\n'
 read -n 1 -r -p "Distribution: " distro
 
 echo -e '\n\nThe value entered in this field will only affect the version reported to the package manager. The latest source is used regardless.\n'
 read -r -p "Version number: " version
 
+echo -e '\nThe value entered in this field will only affect the revision number for build scripts.\n'
+read -r -p "Revision number: " revision
+
 if [ "$distro" == "4" ] || [ "$distro" == "5" ] || [ "$distro" == "6" ]; then
-    echo -e '\nThe value entered in this field will only affect the revision number for build scripts.\n'
-    read -r -p "Revision number: " revision
+    echo -e '\nOptions (please enter the number only):'
+    echo -e '\n1. GitHub Release Tag\n2. Local\n'
+    read -r -p "Source (for build scripts): " source
+
+    if [ "$source" == "1" ]; then
+        source='https://github.com/rwinkhart/sshyp/releases/download/v$pkgver/sshyp-$pkgver.tar.xz'
+    else
+        source=local://sshyp-"$version".tar.xz
+    fi
 fi
 
 mkdir -p packages
 
+if [ "$distro" == "1" ] || [ "$distro" == "6" ]; then
+    echo -e '\nPackaging for Debian...\n'
+    mkdir -p packages/debiantemp/sshyp_"$version"-"$revision"_all/{DEBIAN,usr}
+    mkdir -p packages/debiantemp/sshyp_"$version"-"$revision"_all/var/lib/sshyp
+    mkdir -p packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/share/man/man1
+    echo "Package: sshyp
+Version: $version
+Section: utils
+Architecture: all
+Maintainer: Randall Winkhart <idgr at tutanota dot com>
+Description: A light-weight, self-hosted, synchronized password manager
+Depends: python3, gnupg, openssh-client, nano, xclip, wl-clipboard
+Priority: optional
+Installed-Size: 35
+" > packages/debiantemp/sshyp_"$version"-"$revision"_all/DEBIAN/control
+    cp -r bin packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/
+    cp -r share packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/
+    cp extra/manpage packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/share/man/man1/sshyp.1
+    gzip packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/share/man/man1/sshyp.1
+    dpkg-deb --build --root-owner-group packages/debiantemp/sshyp_"$version"-"$revision"_all/
+    mv packages/debiantemp/sshyp_"$version"-"$revision"_all.deb packages/
+    rm -rf packages/debiantemp
+    echo -e "\nDebian packaging complete.\n"
+fi
+
 if [ "$distro" == "2" ] || [ "$distro" == "6" ]; then
     echo -e '\nPackaging for Termux...\n'
-    mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_termux/{data,DEBIAN}
-    mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_termux/data/data/com.termux/files/usr/var
-    mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_termux/data/data/com.termux/files/usr/share/man/man1
+    mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/{data,DEBIAN}
+    mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/var/lib/sshyp
+    mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/share/man/man1
     echo "Package: sshyp
 Version: $version
 Section: utils
@@ -33,19 +69,21 @@ Architecture: all
 Maintainer: Randall Winkhart <idgr at tutanota dot com>
 Description: A light-weight, self-hosted, synchronized password manager
 Depends: python, gnupg, openssh, nano, termux-api, termux-am
-" > packages/termuxtemp/sshyp_"$version"-"$revision"_termux/DEBIAN/control
-    cp -r bin packages/termuxtemp/sshyp_"$version"-"$revision"_termux/data/data/com.termux/files/usr/
-    cp -r share packages/termuxtemp/sshyp_"$version"-"$revision"_termux/data/data/com.termux/files/usr/
-    touch packages/termuxtemp/sshyp_"$version"-"$revision"_termux/data/data/com.termux/files/usr/var/flag_termux
-    cp extra/manpage packages/termuxtemp/sshyp_"$version"-"$revision"_termux/data/data/com.termux/files/usr/share/man/man1/sshyp.1
-    gzip packages/termuxtemp/sshyp_"$version"-"$revision"_termux/data/data/com.termux/files/usr/share/man/man1/sshyp.1
-    dpkg-deb --build --root-owner-group packages/termuxtemp/sshyp_"$version"-"$revision"_termux/
-    mv packages/termuxtemp/sshyp_"$version"-"$revision"_termux.deb packages/
+Priority: optional
+Installed-Size: 35
+" > packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/DEBIAN/control
+    cp -r bin packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/
+    cp -r share packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/
+    touch packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/var/lib/sshyp/flag_termux
+    cp extra/manpage packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/share/man/man1/sshyp.1
+    gzip packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/share/man/man1/sshyp.1
+    dpkg-deb --build --root-owner-group packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/
+    mv packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux.deb packages/
     rm -rf packages/termuxtemp
     echo -e "\nTermux packaging complete.\n"
 fi
 
-if [ "$distro" == "3" ] || [ "$distro" == "6" ]; then
+if [ "$distro" == "3" ] || [ "$distro" == "5" ] || [ "$distro" == "6" ]; then
     echo -e '\nPackaging as generic...\n'
     mkdir -p packages/archtemp/var/lib/sshyp
     mkdir -p packages/archtemp/usr
@@ -56,39 +94,37 @@ if [ "$distro" == "3" ] || [ "$distro" == "6" ]; then
     gzip packages/archtemp/usr/share/man/man1/sshyp.1
     tar -C packages/archtemp -cvf packages/sshyp-"$version".tar.xz usr/ var/
     rm -rf packages/archtemp
-    echo -e '\nsha512 sum:'
-    sha512sum packages/sshyp-"$version".tar.xz
-    echo -e '\nsha256 sum:'
-    sha256sum packages/sshyp-"$version".tar.xz
+    sha512="$(sha512sum packages/sshyp-"$version".tar.xz | awk '{print $1;}')"
+    echo -e "\nsha512 sum:\n$sha512"
     echo -e "\nGeneric packaging complete.\n"
 fi
 
 if [ "$distro" == "5" ] || [ "$distro" == "6" ]; then
     echo -e '\nGenerating PKGBUILD...'
-    echo '# Maintainer: Randall Winkhart <idgr at tutanota dot com>
+    echo "# Maintainer: Randall Winkhart <idgr at tutanota dot com>
 
 pkgname=sshyp
-pkgver='"$version"'
-pkgrel='"$revision"'
+pkgver="$version"
+pkgrel="$revision"
 pkgdesc='A light-weight, self-hosted, synchronized password manager'
 url='https://github.com/rwinkhart/sshyp'
 arch=('any')
 license=('GPL3')
-depends=( python gnupg openssh nano xclip wl-clipboard)
+depends=(python gnupg openssh nano xclip wl-clipboard)
 
-source=("https://github.com/rwinkhart/sshyp/releases/download/v$pkgver/sshyp-$pkgver.tar.xz")
-sha512sums=('be6695cc231f4414322f2c4b919caf0759f4111e50259b3a6bbcb6e90a0ceba5d094c8766c287e5443c61adfdf414c1a93bc70e505dfd4bf34097c713b6e7d2f')
+source=(\""$source"\")
+sha512sums=('"$sha512"')
 
 package() {
 
-    tar xf sshyp-"$pkgver".tar.xz -C "${pkgdir}"
-    chown -R "$USER" ${pkgdir}/var/lib/sshyp
+    tar xf sshyp-"\"\$pkgver\"".tar.xz -C "\"\${pkgdir}\""
+    chown -R \"\$USER\" "\"\${pkgdir}\""/var/lib/sshyp
 
 }
-' > packages/PKGBUILD
+" > packages/PKGBUILD
     echo -e "\nPKGBUILD generated.\n"
 fi
 
-if [ "$distro" == "1" ] || [ "$distro" == "4" ]; then
-    echo -e '\nThis packaging format is not yet supported, but will be in the near future!\n\nCurrently supported options are:\nTermux\nGeneric\nArch (PKGBUILD)\n'
+if [ "$distro" == "4" ]; then
+    echo -e '\nThis packaging format is not yet supported, but will be in the near future!\n'
 fi