diff --git a/.gitignore b/.gitignore
index 045f294..1521c8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-tini.o
-tini
+dist
diff --git a/Makefile b/Makefile
index d347c8b..b197d6b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,6 @@ $(BIN): $(OBJ)
 
 $(OBJ):
 
-check:
-	docker build -t tini .
-	python test/test.py
-
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
diff --git a/ddist.sh b/ddist.sh
new file mode 100755
index 0000000..74984c4
--- /dev/null
+++ b/ddist.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+
+REL_HERE=$(dirname "${BASH_SOURCE}")
+HERE=$(cd "${REL_HERE}"; pwd)
+
+DIST_DIR="${HERE}/dist"
+rm -rf "${DIST_DIR}"
+
+IMG="tini"
+NAME="${IMG}-dist"
+BIN="tini"
+
+docker build -t "${IMG}" .
+
+docker run -it --name="${NAME}" --entrypoint="bash" --workdir="/tini" "${IMG}" "-c" "make clean && make"
+docker cp "${NAME}:/tini/${BIN}" "${DIST_DIR}"
+docker rm "${NAME}"
diff --git a/dtest.sh b/dtest.sh
new file mode 100755
index 0000000..07fcfbf
--- /dev/null
+++ b/dtest.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+
+IMG="tini"
+
+
+docker build -t "${IMG}" .
+python test/test.py  "${IMG}"
diff --git a/test/test.py b/test/test.py
index 000b022..980e9f9 100644
--- a/test/test.py
+++ b/test/test.py
@@ -55,6 +55,9 @@ class Command(object):
 
 
 if __name__ == "__main__":
+    img = sys.argv[1]
+    name = "{0}-test".format(img)
+
     root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 
     # Tests rely on exiting fast enough (exiting at all, in fact).
@@ -62,12 +65,12 @@ if __name__ == "__main__":
         "docker",
         "run",
         "--rm",
-        "--name=tini-test",
-        "tini",
+        "--name={0}".format(name),
+        img,
         "-vvvv",
     ]
 
-    fail_cmd = ["docker", "kill", "tini-test"]
+    fail_cmd = ["docker", "kill", name]
 
     # Reaping test
     Command(base_cmd + ["/tini/test/reaping/stage_1.py"], fail_cmd).run(timeout=10)
@@ -77,7 +80,7 @@ if __name__ == "__main__":
         Command(
             base_cmd + ["--", "/tini/test/signals/test.py"],
             fail_cmd,
-            ["docker", "kill", "-s", sig, "tini-test"],
+            ["docker", "kill", "-s", sig, name],
             2
         ).run(timeout=10, retcode=retcode)