diff --git a/pandoc/Dockerfile b/pandoc/Dockerfile
new file mode 100644
index 0000000..b46bfae
--- /dev/null
+++ b/pandoc/Dockerfile
@@ -0,0 +1,6 @@
+FROM haskell
+MAINTAINER Jessica Frazelle <jess@docker.com>
+
+RUN cabal update && cabal install pandoc pandoc-citeproc
+
+ENTRYPOINT [ "pandoc" ]
diff --git a/vlc/Dockerfile b/vlc/Dockerfile
index 4a56547..6619d06 100644
--- a/vlc/Dockerfile
+++ b/vlc/Dockerfile
@@ -21,7 +21,8 @@ RUN apt-get update && apt-get install -y \
 
 ENV HOME /home/vlc
 RUN useradd --create-home --home-dir $HOME vlc \
-	&& chown -R vlc:vlc $HOME
+	&& chown -R vlc:vlc $HOME \
+	&& usermod -a -G audio,video vlc
 
 WORKDIR $HOME
 USER vlc