diff --git a/Dockerfile b/Dockerfile
index 09e82d4..8bf3f66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,5 +8,5 @@ RUN mkdir /root/.ssh && \
 COPY ssh-find-agent.sh /root/ssh-find-agent.sh
 EXPOSE 22
 VOLUME ["/root/.ssh/authorized_keys"]
-ENTRYPOINT ["/usr/bin/tini","--"]
+ENTRYPOINT ["/sbin/tini","--"]
 CMD ["/usr/sbin/sshd","-D"]
diff --git a/Makefile b/Makefile
index 49c0488..0a79234 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-all:
+all: install
 	./pinata-build-sshd.sh
-	@echo Please run "make install"
 
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
diff --git a/README.md b/README.md
index 1389361..781d3bd 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@ Assuming you have a `/usr/local`
 ```
 $ git clone git://github.com/avsm/docker-ssh-agent-forward
 $ make
-$ make install
 ```
 
 On every boot, do:
diff --git a/pinata-ssh-forward.sh b/pinata-ssh-forward.sh
index 4b236d4..3b4723a 100755
--- a/pinata-ssh-forward.sh
+++ b/pinata-ssh-forward.sh
@@ -10,6 +10,7 @@ rm -rf ${LOCAL_STATE}
 mkdir -p ${LOCAL_STATE}
 
 docker run --name ${CONTAINER_NAME} \
+  --restart always \
   -v ~/.ssh/id_rsa.pub:/root/.ssh/authorized_keys \
   -v ${LOCAL_STATE}:/tmp \
   -d -p ${LOCAL_PORT}:22 ${IMAGE_NAME} > /dev/null