diff --git a/.gitignore b/.gitignore
index c576540c..54466f5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /target
-/contrib/*.deb
+
diff --git a/Cargo.toml b/Cargo.toml
index 4e197ab8..4c2f1f26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,5 +56,5 @@ overflow-checks = false
 section = "web"
 assets = [
     ["target/release/gossip", "/usr/bin/", "755"],
-    ["contrib/gossip.desktop", "/usr/share/applications/gossip.desktop", "644"],
+    ["packaging/debian/gossip.desktop", "/usr/share/applications/gossip.desktop", "644"],
 ]
diff --git a/packaging/arch/.gitignore b/packaging/arch/.gitignore
new file mode 100644
index 00000000..0b6157df
--- /dev/null
+++ b/packaging/arch/.gitignore
@@ -0,0 +1,4 @@
+*.bz2
+*.zst
+pkg/
+src/
diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD
new file mode 100644
index 00000000..2d17ad5a
--- /dev/null
+++ b/packaging/arch/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Michael Dilger <mike@mikedilger.com>
+pkgname='gossip'
+pkgver='0.3.90'
+pkgrel=1
+pkgdesc='A desktop nostr client'
+arch=('i686' 'x86_64')
+url='https://github.com/mikedilger/$pkgname'
+license=('MIT')
+depends=('openssl' 'gcc-libs')
+makedepends=('git' 'cargo')
+_tag=528012c1501aac5a60e4d525385b13110a45467c
+source=("git+$url#tag=$_tag")
+
+sha1sums=('337fb8a862b64c7da16f7bbe4fe07aff2ff812e9')
+
+build() {
+  cd "$pkgname"
+  RUSTFLAGS="-C target-cpu=native --cfg tokio_unstable" cargo build --release
+  strip ./target/release/gossip
+}
+
+package() {
+  cd "$pkgname"
+  install -Dm755 "./target/release/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "./LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/contrib/arch-bin-deps.sh b/packaging/arch/arch-bin-deps.sh
similarity index 84%
rename from contrib/arch-bin-deps.sh
rename to packaging/arch/arch-bin-deps.sh
index ca767166..08844999 100755
--- a/contrib/arch-bin-deps.sh
+++ b/packaging/arch/arch-bin-deps.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This is the binary we are inspecting
-BIN=./target/release/gossip
+BIN=../../target/release/gossip
 
 # This uses ldd to get it's dependencies into a list
 DEPS=$(pacman -F $(ldd "$BIN" | awk '{print $3}') | awk '{print $5}'  | awk -F/ '{print $2}' | tr " " "\n" | sort -u | tr "\n" " ")
@@ -30,9 +30,11 @@ echo $TODELETE | tr " " "\n" > /tmp/file2.txt
 
 comm -3 /tmp/file1.txt /tmp/file2.txt | sed '/\t/d'
 
-# json-glib
-# libstemmer
-# libutil-linux  (util-linux-libs)
-# webkit2gtk
+# I'm getting 'gcc-libs' today as the only output.
+# But in the past I got:
+#   json-glib
+#   libstemmer
+#   libutil-linux  (util-linux-libs)
+#   webkit2gtk
 #
 # pacman -S json-glib libstemmer util-linux-libs webkit2gtk
diff --git a/packaging/debian/.gitignore b/packaging/debian/.gitignore
new file mode 100644
index 00000000..c00df136
--- /dev/null
+++ b/packaging/debian/.gitignore
@@ -0,0 +1 @@
+*.deb
diff --git a/contrib/Dockerfile b/packaging/debian/Dockerfile
similarity index 93%
rename from contrib/Dockerfile
rename to packaging/debian/Dockerfile
index 4e0b48b1..5fa4f76a 100644
--- a/contrib/Dockerfile
+++ b/packaging/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.65-bullseye as builder
+FROM rust:1.67-bullseye as builder
 
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
diff --git a/contrib/deb.sh b/packaging/debian/deb.sh
similarity index 62%
rename from contrib/deb.sh
rename to packaging/debian/deb.sh
index 0726348e..a890af7f 100755
--- a/contrib/deb.sh
+++ b/packaging/debian/deb.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-cd $SCRIPT_DIR/..
+cd $SCRIPT_DIR/../..
 DOCKER_BUILDKIT=1 \
   docker build \
-  --output contrib \
-  -f contrib/Dockerfile \
+  --output packaging/debian \
+  -f packaging/debian/Dockerfile \
   .
 
diff --git a/contrib/gossip.desktop b/packaging/debian/gossip.desktop
similarity index 100%
rename from contrib/gossip.desktop
rename to packaging/debian/gossip.desktop
diff --git a/packaging/tar/.gitignore b/packaging/tar/.gitignore
new file mode 100644
index 00000000..bb541719
--- /dev/null
+++ b/packaging/tar/.gitignore
@@ -0,0 +1,2 @@
+*.gz
+*.bz2
diff --git a/packaging/tar/make-tar.sh b/packaging/tar/make-tar.sh
new file mode 100755
index 00000000..2a489bbd
--- /dev/null
+++ b/packaging/tar/make-tar.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd ../../..
+tar -cv --exclude=gossip/.git --exclude=gossip/target --exclude=gossip/packaging -f - gossip | bzip2 -c > gossip/packaging/tar/gossip.tar.bz2