diff --git a/dev/fedora/22/spacemacs/Dockerfile b/dev/fedora/22/spacemacs/Dockerfile
new file mode 100644
index 0000000..3b619c6
--- /dev/null
+++ b/dev/fedora/22/spacemacs/Dockerfile
@@ -0,0 +1,10 @@
+FROM xena/base
+
+RUN dnf -y install emacs
+
+USER xena
+RUN git clone https://github.com/syl20bnr/spacemacs /home/xena/.emacs.d
+RUN emacs --daemon
+RUN emacs --daemon
+
+CMD /bin/zsh
diff --git a/dev/tup/99-tup.list b/dev/tup/99-tup.list
new file mode 100644
index 0000000..ec895ae
--- /dev/null
+++ b/dev/tup/99-tup.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/titanous/tup/ubuntu trusty main
+deb-src http://ppa.launchpad.net/titanous/tup/ubuntu trusty main
diff --git a/dev/tup/Dockerfile b/dev/tup/Dockerfile
new file mode 100644
index 0000000..1b7831e
--- /dev/null
+++ b/dev/tup/Dockerfile
@@ -0,0 +1,11 @@
+FROM alpine
+
+RUN apk update && apk add alpine-sdk fuse-dev
+
+RUN mkdir /usr/src
+
+RUN cd /usr/src &&\
+    git clone git://github.com/gittup/tup.git &&\
+    cd tup &&\
+    ./bootstrap.sh &&\
+    cp tup /usr/local/bin/tup
diff --git a/net/convos/Dockerfile b/net/convos/Dockerfile
new file mode 100644
index 0000000..9d73aab
--- /dev/null
+++ b/net/convos/Dockerfile
@@ -0,0 +1,8 @@
+FROM nordaaker/convos
+
+ENV CONVOS_ARCHIVE_DIR /data/convos/archive
+ENV CONVOS_ORGANIZATION_NAME XeServ
+ENV CONVOS_REDIS_URL redis://10.0.0.5:6379/2
+ENV VIRTUAL_HOST shout.xeserv.us
+ENV CONVOS_INVITE_CODE faggot
+ENV MOJO_REVERSE_PROXY 1