diff --git a/Dockerfile b/Dockerfile
index 994bdd4dc2c31269f27f3cd54a9e8ecb7fb68611..61234ed739aa25e80158d36f59e249e876305676 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,9 @@ RUN cd /go/src/github.com/jbenet/go-ipfs/cmd/ipfs && go install
 
 EXPOSE 4001
 
-CMD ["ipfs", "run"]
+ENTRYPOINT ["ipfs"]
+
+CMD ["run"]
 
 # build:    docker build -t go-ipfs .
-# run:      docker run -p 4001:4001 -e "IPFS_LOGGING=debug" go-ipfs:latest
+# run:      docker run -p 4001:4001 -e "IPFS_LOGGING=debug" go-ipfs:latest run