diff --git a/Dockerfile b/Dockerfile
index 8ef3af04c..672d64c1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,8 @@ EXPOSE     9090
 VOLUME     [ "/prometheus" ]
 WORKDIR    /prometheus
 
-ENTRYPOINT [ "/prometheus-src/prometheus", "-config.file=/prometheus.conf" ]
+ENTRYPOINT [ "/prometheus-src/prometheus" ]
+CMD        [ "-config.file=/prometheus.conf" ]
 RUN        apt-get update && apt-get install -yq make git curl sudo mercurial vim-common
 ADD        . /prometheus-src
 RUN        cd /prometheus-src && make tools binary