diff --git a/dev/rust/Dockerfile b/dev/rust/Dockerfile
new file mode 100644
index 0000000..188f9f1
--- /dev/null
+++ b/dev/rust/Dockerfile
@@ -0,0 +1,4 @@
+FROM docker.io/xena/dotfiles
+
+ENV SHELL /bin/bash
+RUN curl -s https://static.rust-lang.org/rustup.sh | sh
diff --git a/net/irssi/base/Dockerfile b/net/irssi/base/Dockerfile
index 37f6ad8..781886b 100644
--- a/net/irssi/base/Dockerfile
+++ b/net/irssi/base/Dockerfile
@@ -1,16 +1,8 @@
-FROM ubuntu:trusty
+FROM irssi
 
-RUN apt-get update && apt-get install irssi git-core -y
-
-# create smurf user
-RUN addgroup user && adduser --ingroup user --disabled-password user
-
-ENV HOME /home/user
-ENV LC_CTYPE en_US.UTF-8
-
-# I use tmux in 256 color mode. Too bad if you don't.
-ENV TERM screen-256color
+USER root
+RUN apt-get update && apt-get install git
 
 USER user
-
-CMD irssi
+# I use tmux in 256 color mode. Too bad if you don't.
+ENV TERM screen-256color