diff --git a/nes/Dockerfile b/nes/Dockerfile
new file mode 100644
index 0000000..9a165bb
--- /dev/null
+++ b/nes/Dockerfile
@@ -0,0 +1,38 @@
+# NES emulator in a container
+#
+# docker run --rm -d \
+# 	--device /dev/snd \
+# 	-v /tmp/.X11-unix:/tmp/.X11-unix \
+# 	-e DISPLAY=unix$DISPLAY \
+# 	--device /dev/dri \
+# 	jess/nes /games/zelda.rom
+#
+FROM debian:sid
+MAINTAINER Jessica Frazelle <jess@docker.com>
+
+RUN apt-get update && apt-get install -y \
+	binutils \
+	ca-certificates \
+	gcc \
+	git \
+	golang \
+	libgl1-mesa-dev \
+	libgl1-mesa-dri \
+	libxcursor-dev \
+	libxi-dev \
+	libxinerama-dev \
+	libxrandr-dev \
+	mercurial \
+	portaudio19-dev \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& ldconfig
+
+ENV GOPATH /go
+ENV PATH /go/bin:$PATH
+
+RUN go get github.com/fogleman/nes
+
+COPY games /games
+
+ENTRYPOINT [ "nes" ]
diff --git a/nes/games/supermariobros.rom b/nes/games/supermariobros.rom
new file mode 100644
index 0000000..655d013
Binary files /dev/null and b/nes/games/supermariobros.rom differ
diff --git a/nes/games/zelda.rom b/nes/games/zelda.rom
new file mode 100644
index 0000000..d66573d
Binary files /dev/null and b/nes/games/zelda.rom differ
diff --git a/termboy/Dockerfile b/termboy/Dockerfile
index 81ad283..7f1ef48 100644
--- a/termboy/Dockerfile
+++ b/termboy/Dockerfile
@@ -12,28 +12,41 @@
 #	# Build termboy image
 #	docker build -t termboy .
 #
-#	docker run -it termboy
+#	docker run -it \
+#		--device /dev/snd \
+#		termboy
 #
 
 # Base docker image
 FROM debian:jessie
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-ENV TERM linux
-ENV HOME /root
 ENV DEBIAN_FRONTEND noninteractive
 
-COPY termboy-go /usr/bin/termboy-go
-
 # Install dependencies
 RUN apt-get update && apt-get install -y \
+	ca-certificates \
+	console-setup \
+	console-setup-linux \
+	g++ \
+	git \
 	kbd \
+	libasound2-dev \
+	libncurses5-dev \
+	libncursesw5-dev \
+	make \
+	sudo \
 	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& mkdir -p $HOME/.config/termboy
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN git clone https://github.com/dobyrch/termboy --depth 1 /src \
+	&& cd /src \
+	&& make \
+	&& make install || true
+
 
 # add games
-COPY games $HOME/games
+COPY games /games
 
 # Autorun termboy
-ENTRYPOINT ["/usr/bin/termboy-go"]
+ENTRYPOINT ["/usr/bin/termboy"]