diff --git a/Dockerfile b/Dockerfile
index 8783591..207a6b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,20 @@
 # version 0.0.1
-# docker-version 0.6.1
-from        ubuntu:12.04
-maintainer  Jim Myhrberg "contact@jimeh.me"
+# docker-version 0.6.6
+FROM        ubuntu:12.04
+MAINTAINER  Jim Myhrberg "contact@jimeh.me"
 
 # Make sure the package repository is up to date.
-run     echo "deb http://archive.ubuntu.com/ubuntu precise-backports universe" >> /etc/apt/sources.list
-run     apt-get update
-
+RUN         echo "deb http://archive.ubuntu.com/ubuntu precise-backports universe" >> /etc/apt/sources.list
+RUN         apt-get update
 
 # Let's do this...
-run     apt-get install -y znc/precise-backports znc-dbg/precise-backports znc-dev/precise-backports znc-extra/precise-backports znc-perl/precise-backports znc-python/precise-backports znc-tcl/precise-backports && apt-get clean
+RUN         apt-get install -y znc/precise-backports znc-dbg/precise-backports znc-dev/precise-backports znc-extra/precise-backports znc-perl/precise-backports znc-python/precise-backports znc-tcl/precise-backports && apt-get clean
 
-run     useradd znc
-add     start-znc /usr/local/bin/
-add     znc.conf.default /src/
+RUN         useradd znc
+ADD         start-znc /usr/local/bin/
+ADD         znc.conf.default /src/
 
-user       znc
-expose     6667
-entrypoint ["/usr/local/bin/start-znc"]
-cmd        [""]
+USER        znc
+EXPOSE      6667
+ENTRYPOINT  ["/usr/local/bin/start-znc"]
+CMD         [""]