diff --git a/Dockerfile.arch b/Dockerfile.arch
index 94244ab0..9a019151 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -34,7 +34,8 @@ RUN pacman -S --needed --noconfirm \
   sqlite \
   valgrind \
   gdk-pixbuf2 \
-  qrencode
+  qrencode \
+  expect
 
 RUN mkdir -p /usr/src/{stabber,profanity}
 
@@ -57,13 +58,13 @@ USER root
 RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
 
 WORKDIR /usr/src
-#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false -b fix/xmpp-parsing https://git.jabber.space/jabber.developer2/stabber
 
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src/profanity
 COPY . /usr/src/profanity
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 114aec28..d07a1c46 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -30,19 +30,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   valgrind \
   libsqlite3-dev \
   libgdk-pixbuf-2.0-dev \
-  libqrencode-dev
+  libqrencode-dev \
+  tcl-expect-dev
 
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
 
-#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false -b fix/xmpp-parsing https://git.jabber.space/jabber.developer2/stabber
 RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index c8004c11..67dd6334 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -46,13 +46,12 @@ ENV LC_ALL en_US.UTF-8
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-#RUN mkdir -p /usr/src/stabber
-#RUN git clone https://github.com/boothj5/stabber
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+RUN git clone -c http.sslverify=false -b fix/xmpp-parsing https://git.jabber.space/jabber.developer2/stabber
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
diff --git a/Dockerfile.tumbleweed b/Dockerfile.tumbleweed
index 1777d170..132ee37c 100644
--- a/Dockerfile.tumbleweed
+++ b/Dockerfile.tumbleweed
@@ -45,13 +45,12 @@ ENV LC_ALL en_US.UTF-8
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-#RUN mkdir -p /usr/src/stabber
-#RUN git clone git://github.com/boothj5/stabber.git
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+RUN git clone -c http.sslverify=false -b fix/xmpp-parsing https://git.jabber.space/jabber.developer2/stabber
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 RUN mkdir -p /usr/src/profanity
 WORKDIR /usr/src/profanity
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 7f100ddd..12d62ea7 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -31,20 +31,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   valgrind \
   libsqlite3-dev \
   libgdk-pixbuf-2.0-dev \
-  libqrencode-dev
+  libqrencode-dev \
+  tcl-expect-dev
 
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
 
-#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false -b fix/xmpp-parsing https://git.jabber.space/jabber.developer2/stabber
 RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 
-# TODO: Re-enable once libmicrohttpd-dev has been updated.
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh