diff --git a/rtorrent/Dockerfile.filebrowser b/rtorrent/Dockerfile.filebrowser
new file mode 100644
index 0000000..3ec40a5
--- /dev/null
+++ b/rtorrent/Dockerfile.filebrowser
@@ -0,0 +1,25 @@
+FROM centos:7
+
+# The GitHub tag to fetch
+ARG FILEBROWSER_RELEASE
+
+# Download filebrowser from 
+RUN mkdir /opt/filebrowser/{bin,etc,var} \
+ && curl -o /tmp/filebrowser.tar.gz https://github.com/filebrowser/filebrowser/releases/download/${FILEBROWSER_RELEASE}/linux-amd64-filebrowser.tar.gz \
+ && tar xvf /tmp/filebrowser.tar.gz -C /opt/filebrowser/bin filebrowser \
+ && chmod 755 /opt/filebrowser/bin/filebrowser \
+ && rm -f /tmp/filebrowser.tar.gz
+
+# File Browser configuration file
+ADD filebrowser-config.yaml /opt/filebrowser/etc/config.yaml
+
+VOLUME /opt/filebrowser/var
+VOLUME /torrent/incoming
+VOLUME /torrent/download
+
+# HTTP Port
+EXPOSE 8080
+
+ENTRYPOINT [ "/opt/filebrowser/bin/filebrowser" ]
+CMD [ "--config", "/opt/filebrowser/etc/config.yaml" ]
+
diff --git a/rtorrent/Dockerfile b/rtorrent/Dockerfile.rtorrent
similarity index 94%
rename from rtorrent/Dockerfile
rename to rtorrent/Dockerfile.rtorrent
index c4ea5f6..814241c 100644
--- a/rtorrent/Dockerfile
+++ b/rtorrent/Dockerfile.rtorrent
@@ -35,6 +35,9 @@ EXPOSE 6881/udp
 ADD rtorrent.rc /etc/rtorrent.rc
 ADD custom.rc /etc/rtorrent/custom.rc
 
+# We need to make rtorrent believe it has a valid term
+ENV TERM=xterm
+
 # The unbuffer command is used as entrypoint to fake a tty.
 # It is required since the daemon mode will only be available 
 # with rtorrent 0.9.7.
diff --git a/rtorrent/filebrowser-config.yaml b/rtorrent/filebrowser-config.yaml
new file mode 100644
index 0000000..076237c
--- /dev/null
+++ b/rtorrent/filebrowser-config.yaml
@@ -0,0 +1,11 @@
+---
+port: 8080
+baseURL: /
+noAuth: true # We will use the OpenShift OAuth Proxy
+database: "/opt/filebrowser/var/database.db"
+log: stdout
+plugin: ''
+scope: "/torrent"
+allowCommands: false
+allowEdit: true
+allowNew: true