diff --git a/firefox/Dockerfile b/firefox/Dockerfile
new file mode 100644
index 0000000..bb3383f
--- /dev/null
+++ b/firefox/Dockerfile
@@ -0,0 +1,27 @@
+FROM debian:sid
+MAINTAINER Jessica Frazelle <jess@docker.com>
+
+RUN sed -i.bak 's/sid main/sid main contrib/g' /etc/apt/sources.list && \
+	apt-get update && apt-get install -y \
+	bzip2 \
+	ca-certificates \
+	curl \
+	flashplugin-nonfree \
+	hicolor-icon-theme \
+	libasound2 \
+	libdbus-glib-1-2 \
+	libgl1-mesa-dri \
+	libgl1-mesa-glx \
+	--no-install-recommends
+
+ENV FIREFOX_VERSION 38.0.5
+
+RUN curl -sSL "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/latest/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.bz2" -o /tmp/firefox.tar.bz2 \
+	&& mkdir -p /opt/firefox \
+	&& tar -xjf /tmp/firefox.tar.bz2 -C /opt/firefox --strip-components 1 \
+	&& rm /tmp/firefox.tar.bz2* \
+	&& ln -s /opt/firefox/firefox /usr/bin/firefox
+
+COPY local.conf /etc/fonts/local.conf
+
+ENTRYPOINT [ "/usr/bin/firefox" ]
diff --git a/firefox/local.conf b/firefox/local.conf
new file mode 100644
index 0000000..51dd0d3
--- /dev/null
+++ b/firefox/local.conf
@@ -0,0 +1,29 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+<match target="font">
+<edit mode="assign" name="rgba">
+<const>rgb</const>
+</edit>
+</match>
+<match target="font">
+<edit mode="assign" name="hinting">
+<bool>true</bool>
+</edit>
+</match>
+<match target="font">
+<edit mode="assign" name="hintstyle">
+<const>hintslight</const>
+</edit>
+</match>
+<match target="font">
+<edit mode="assign" name="antialias">
+<bool>true</bool>
+</edit>
+</match>
+<match target="font">
+<edit mode="assign" name="lcdfilter">
+<const>lcddefault</const>
+</edit>
+</match>
+</fontconfig>