diff --git a/Dockerfile b/Dockerfile
index ba298c3..e1705ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,12 @@ ARG HUGO_PORT
 
 ENV HUGO_HOST "http://$HUGO_HOST:$HUGO_PORT"
 
+ADD serve.sh /serve.sh
+
 WORKDIR /app
 
-CMD ["serve","-b","http://docker:1313"]
+#CMD ["serve"]
+
+ENTRYPOINT ["/serve.sh"]
 
 VOLUME ["/app"]
diff --git a/README b/README.md
similarity index 100%
rename from README
rename to README.md
diff --git a/serve.sh b/serve.sh
new file mode 100755
index 0000000..fd3f18a
--- /dev/null
+++ b/serve.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -xe
+
+if [ -z $1 ]
+then
+	hugo serve -b ${HUGO_HOST}
+else
+	exec hugo $@
+fi