diff --git a/Dockerfile b/Dockerfile
index 318f371..77f50ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ MAINTAINER Adrian Dvergsdal [atmoz.net]
 # - OpenSSH needs /var/run/sshd to run
 # - Remove generic host keys, entrypoint generates unique keys
 RUN apt-get update && \
-    apt-get -y install openssh-server && \
+    apt-get -y install openssh-server makepasswd && \
+    rm -rf /var/lib/apt/lists/* && \
     mkdir -p /var/run/sshd && \
-    rm -f /etc/ssh/ssh_host_*key* && \
-    rm -rf /var/lib/apt/lists/*
+    rm -f /etc/ssh/ssh_host_*key*
 
 COPY sshd_config /etc/ssh/sshd_config
 COPY entrypoint /
diff --git a/README.md b/README.md
index 975a137..083d8b9 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,8 @@ docker run \
     'foo:$1$0G2g0GSt$ewU0t6GXG15.0hWoOX8X9.:e:1001'
 ```
 
-Tip: you can use makepasswd to generate encrypted passwords:  
-`echo -n "password" | makepasswd --crypt-md5 --clearfrom -`
+Tip: you can use [makepasswd](https://packages.debian.org/jessie/makepasswd) (included in the debian image) to generate encrypted passwords:  
+`echo -n "password" | docker run -i --rm --entrypoint=makepasswd atmoz/sftp:debian --crypt-md5 --clearfrom -`
 
 ## Using SSH key (without password)