diff --git a/mk.sh b/mk.sh
index 85598eb..d6404db 100755
--- a/mk.sh
+++ b/mk.sh
@@ -27,8 +27,10 @@ PKGBUILDDIR="$BUILDROOT/$PRODUCT/build"
 PKGDEPLOYDIR="$BUILDROOT/$PRODUCT/deploy"
 PKGLOGDIR="$BUILDROOT/$PRODUCT/log"
 PACKAGELIST="$BUILDROOT/$PRODUCT/pkglist"
+REPODIR="$BUILDROOT/$PRODUCT/repo"
 
 mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR" "$PKGDEPLOYDIR"
+mkdir -p "$REPODIR"
 
 pushd "$SCRIPTDIR" > /dev/null
 OS_NAME="Pygos"
@@ -82,6 +84,16 @@ while read pkg; do
 		strip_files ${PKGDEPLOYDIR}/${PKGNAME}/{bin,lib}
 		restore_toolchain
 
+		if [ -d "$PKGDEPLOYDIR/$PKGNAME" ]; then
+			for f in $PKGDEPLOYDIR/$PKGNAME/*.desc; do
+				if [ ! -f "$f" ]; then
+					continue
+				fi
+
+				pkg pack -r "$REPODIR" -d "$f" -l $PKGDEPLOYDIR/$PKGNAME/$(basename "$f" .desc).files
+			done
+		fi
+
 		rm -rf "$PKGBUILDDIR"
 		touch "$PKGLOGDIR/.$pkg"
 	fi
diff --git a/pkg/tc-pkg-config/build b/pkg/tc-pkg-config/build
index d52baf6..56cf14a 100755
--- a/pkg/tc-pkg-config/build
+++ b/pkg/tc-pkg-config/build
@@ -3,7 +3,7 @@ SRCDIR="pkg-config-$VERSION"
 TARBALL="$SRCDIR.tar.gz"
 URL="https://pkg-config.freedesktop.org/releases/"
 SHA256SUM="6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
-DEPENDS=""
+DEPENDS="tc-pkgtool"
 
 prepare() {
 	return
diff --git a/pkg/tc-pkgtool/build b/pkg/tc-pkgtool/build
new file mode 100755
index 0000000..27b9d6e
--- /dev/null
+++ b/pkg/tc-pkgtool/build
@@ -0,0 +1,25 @@
+VERSION="0.1"
+SRCDIR="pkgtool-${VERSION}"
+TARBALL="${SRCDIR}.tar.xz"
+URL="http://infraroot.at/pygos"
+SHA256SUM="475ad195886e68e55d71164147b9d7f9a83952a7b2be5836dfd438d6edbb9340"
+DEPENDS=""
+
+prepare() {
+	return
+}
+
+build() {
+	$1/configure --prefix="$TCDIR" --disable-static \
+		     --build="$HOSTTUPLE" --host="$HOSTTUPLE"
+
+	make -j $NUMJOBS
+}
+
+deploy() {
+	make install
+}
+
+check_update() {
+	return
+}
diff --git a/pkg/toolchain/build b/pkg/toolchain/build
index 8c6bb9a..e5a9a5f 100755
--- a/pkg/toolchain/build
+++ b/pkg/toolchain/build
@@ -1,4 +1,4 @@
-DEPENDS="tc-gcc2 musl linux_headers tc-pkg-config tc-file"
+DEPENDS="tc-gcc2 musl linux_headers tc-pkg-config tc-file tc-pkgtool"
 
 build() {
 	return