diff --git a/packaging/Dockerfile.in b/packaging/Dockerfile.in
index 5d50fdb9..c80da184 100644
--- a/packaging/Dockerfile.in
+++ b/packaging/Dockerfile.in
@@ -1,5 +1,9 @@
 FROM fedora:20
 RUN yum -y update
+RUN cd /etc/yum.repos.d && curl -O http://copr-fe.cloud.fedoraproject.org/coprs/walters/rpm-ostree/repo/fedora-20-i386/walters-rpm-ostree-fedora-20-i386.repo
+RUN yum -y install nss-altfiles
+RUN rm /etc/yum.repos.d/walters-rpm-ostree-fedora-20-i386.repo
+RUN sed -i -e 's,passwd:.*,\0 altfiles,' -e 's,group:.*,\0 altfiles,' /etc/nsswitch.conf
 ADD @PACKAGE@ /var/tmp/@PACKAGE@
 RUN yum -y localinstall /var/tmp/@PACKAGE@
-ENTRYPOINT rpm-ostree treecompose
+ENTRYPOINT ["rpm-ostree", "treecompose"]
diff --git a/packaging/Makefile.docker b/packaging/Makefile.docker
index 3e022465..6bdebd93 100644
--- a/packaging/Makefile.docker
+++ b/packaging/Makefile.docker
@@ -2,7 +2,6 @@
 
 include Makefile.dist-packaging
 
-
 docker-local: rpm
 	rm docker -rf
 	mkdir -p docker
@@ -10,4 +9,4 @@ docker-local: rpm
 	sed \
 	-e s,\@PACKAGE\@,$(PACKAGE).rpm,g \
 	< Dockerfile.in > docker/Dockerfile
-	(cd docker && docker build -t cgwalters/rpm-ostree .)
+	(set -x ;cd docker && docker build -t cgwalters/rpm-ostree .)