diff --git a/add_deb_to_repo.sh b/add_deb_to_repo.sh
new file mode 100755
index 0000000..f1e6436
--- /dev/null
+++ b/add_deb_to_repo.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+deb=${1}
+dsc=${2}
+
+if [[ "x${dsc}" == "x" ]]; then
+	echo "usage: ${0} </path/to/deb> </path/to/dsc>"
+	exit 1
+fi
+BASEDIR=~/sources
+REPO="${BASEDIR}/repo/debian"
+# Add binary and source to repo
+reprepro --basedir ${REPO} includedeb unstable ${deb}
+reprepro --basedir ${REPO} -S net --priority optional includedsc unstable ${dsc}
diff --git a/tubefeeder/PKGBUILD b/tubefeeder/PKGBUILD
new file mode 100644
index 0000000..e568388
--- /dev/null
+++ b/tubefeeder/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Micke Nordin <hej@mic.ke>
+pkgname=tubefeeder
+pkgver=1.6.6
+pkgrel=1
+pkgdesc="A Youtube, Lbry and Peertube client made for the Pinephone"
+arch=("$(dpkg --print-architecture)")
+url="https://www.tubefeeder.de"
+license=('GPL')
+groups=()
+depends=('libadwaita-1-0' 'libadwaita-1-dev' 'libssl-dev')
+optdepends=('mpv: Play the videos', 'youtube-dl: Play and download the videos')
+makedepends=('cargo' 'libxml2-utils' 'gettext')
+provides=("${pkgname}")
+conflicts=("${pkgname}")
+replaces=()
+backup=()
+options=()
+install=
+source=("$pkgname.tar.gz::https://github.com/Schmiddiii/Tubefeeder/archive/refs/tags/v$pkgver.tar.gz")
+noextract=()
+md5sums=('1ac142037f2044b93496026785821f5f')
+
+prepare() { 
+        cd "$srcdir/Tubefeeder-${pkgver}"
+        cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
+build() { 
+        cd "$srcdir/Tubefeeder-${pkgver}"
+        export RUSTUP_TOOLCHAIN=stable
+        export CARGO_TARGET_DIR=target
+        CFLAGS="" cargo build --frozen --release --all-features
+} 
+
+package() {
+        cd "$srcdir/Tubefeeder-${pkgver}"
+        # Binary                                                             
+        install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/tubefeeder"
+	# Desktop-file
+	sed -i 's_/app/bin/tubefeeder_/usr/bin/tubefeeder_' packaging/tubefeeder.desktop
+	install -D packaging/tubefeeder.desktop $pkgdir/usr/share/applications/de.schmidhuberj.tubefeeder.desktop
+	# Icon
+	install -D packaging/tubefeeder.png $pkgdir/usr/share/icons/hicolor/512x512/apps/de.schmidhuberj.tubefeeder.png
+	# Localization
+	ls -ld po/locale/*/ | sed 's|.*po/locale/||' | xargs -I % install -D "po/locale/%LC_MESSAGES/de.schmidhuberj.tubefeeder.mo" "$pkgdir/usr/share/locale/%LC_MESSAGES/de.schmidhuberj.tubefeeder.mo"
+}
diff --git a/tubefeeder/deb.sh b/tubefeeder/deb.sh
new file mode 100755
index 0000000..4413393
--- /dev/null
+++ b/tubefeeder/deb.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+
+olddir=$(pwd)
+basedir="${HOME}/sources/external_builds/tubefeeder"
+cd ${basedir}
+# Build binary package
+RUST_BACKTRACE=full makedeb
+
+# Source info from packagebuild
+. PKGBUILD
+
+controlfile="pkg/${pkgname}/debian/control"
+maintainer=$(cat PKGBUILD | grep Maintainer | sed 's/^# //')
+function logentry() {
+        echo "${pkgname} (${pkgver}-${pkgrel}) unstable; urgency=low"
+        echo
+        echo "  * Source package automatically generated"
+	echo
+
+	echo " -- ${maintainer}  $(date -R)"
+        echo
+}
+
+# Move everything to correct position for reuse for src package
+mv pkg/${pkgname}/DEBIAN pkg/${pkgname}/debian
+mv ${pkgname}.tar.gz pkg/${pkgname}-${pkgver}.orig.tar.gz
+mv src/Tubefeeder-${pkgver}/ pkg/${pkgname}/src
+
+# Create chagelog, rules and fix control
+logentry > pkg/${pkgname}/debian/changelog
+touch pkg/${pkgname}/debian/rules
+chmod +x pkg/${pkgname}/debian/rules
+old_control=$(cat ${controlfile} | egrep -v 'Version|Maintainer|License')
+new_control="Source: tubefeeder
+Priority: optional
+Section: video
+${maintainer}
+Build-Depends: cargo, libxml2-utils, gettext
+Standards-Version: 4.0.0
+Vcs-browser: https://github.com/Schmiddiii/Tubefeeder/archive/refs/tags/v${pkgver}.tar.gz
+Homepage: https://www.tubefeeder.de
+
+${old_control}"
+echo "${new_control}" > ${controlfile}
+
+# Build src package
+mv pkg/${pkgname}/ pkg/${pkgname}-${pkgver}/
+cd pkg/${pkgname}-${pkgver}/
+dpkg-buildpackage -S -us -uc
+mv ../tubefeeder_* ${olddir}/ 
+mv ../../tubefeeder_*.deb ${olddir}/ 
+cd ${basedir}
+rm -r pkg/ src/
+cd ${olddir}
diff --git a/upnpy/deb.sh b/upnpy/deb.sh
new file mode 100755
index 0000000..6da61de
--- /dev/null
+++ b/upnpy/deb.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+VERSION=${1}
+
+if [[ "x${VERSION}" == "x" ]];then
+	VERSION="1.1.8"
+fi
+olddir=$(pwd)
+builddir=$(mktemp -d)
+cd ${builddir}
+
+wget https://github.com/5kyc0d3r/upnpy/archive/refs/tags/v${VERSION}.tar.gz
+tar xfv v${VERSION}.tar.gz
+cd upnpy-${VERSION}
+python3 setup.py --command-packages=stdeb.command bdist_deb
+cp deb_dist/* ${olddir}
+cd ${olddir}
+rm -rf ${builddir}