diff --git a/README.md b/README.md
index 7970a4f..dc4da66 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ Download <https://github.com/datajerk/c2d/archive/master.zip> and extract.
 ### Build Notes
 
 NOTE: cc65 2.13.3 required (no other version supported)
+NOTE: Docker required for `make disttest`
 
 Unix/Linux:
 
diff --git a/bin/c2d.exe b/bin/c2d.exe
index 8393615..1156063 100755
Binary files a/bin/c2d.exe and b/bin/c2d.exe differ
diff --git a/bin/page2text.exe b/bin/page2text.exe
index c9ddf7f..eada6ee 100755
Binary files a/bin/page2text.exe and b/bin/page2text.exe differ
diff --git a/bin/text2page.exe b/bin/text2page.exe
index 2d128e6..7027094 100755
Binary files a/bin/text2page.exe and b/bin/text2page.exe differ
diff --git a/dwine b/dwine
new file mode 100755
index 0000000..19cde84
--- /dev/null
+++ b/dwine
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+set -x
+docker run --rm -it -v $PWD:/pwd wine32 bash -c "cd /pwd && wine $*"
diff --git a/test.sh b/test.sh
index 13669e9..0226800 100755
--- a/test.sh
+++ b/test.sh
@@ -47,9 +47,8 @@ then
 	echo
 	echo "Testing Windows c2d..."
 	echo
-	PATH=$HOME/wine/bin:$PATH
-	echo "wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
-	wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/    /'
+	echo "./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
+	./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/    /'
 	CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
 	if [ "$CHECK" = "$SUM" ]
 	then
@@ -104,11 +103,10 @@ then
 	echo
 	echo "Testing Windows c2d textpage..."
 	echo
-	PATH=$HOME/wine/bin:$PATH
-	echo "wine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
-	wine bin/text2page.exe <${BIN}.text >${BIN}.textpage
-	echo "wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
-	wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/    /'
+	echo "./dwine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
+	./dwine bin/text2page.exe '<'${BIN}.text '>'${BIN}.textpage
+	echo "./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
+	./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/    /'
 	CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
 	if [ "$CHECK" = "$SUM" ]
 	then
@@ -145,9 +143,8 @@ rm -f ${BIN}.dsk
 	echo
 	echo "Testing Windows c2d..."
 	echo
-	PATH=$HOME/wine/bin:$PATH
-	echo "wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
-	wine bin/c2d.exe ${MON} ${BIN}.dsk 2>&1 | sed 's/^/    /'
+	echo "./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
+	./dwine bin/c2d.exe ${MON} ${BIN}.dsk 2>&1 | sed 's/^/    /'
 	CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
 	if [ "$CHECK" = "$SUM" ]
 	then
@@ -183,11 +180,10 @@ then
 	echo
 	echo "Testing Windows c2d textpage..."
 	echo
-	PATH=$HOME/wine/bin:$PATH
-	echo "wine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
-	wine bin/text2page.exe <${BIN}.text >${BIN}.textpage
-	echo "wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
-	wine bin/c2d.exe -t ${BIN}.textpage ${MON} ${BIN}.dsk 2>&1 | sed 's/^/    /'
+	echo "./dwine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
+	./dwine bin/text2page.exe '<'${BIN}.text '>'${BIN}.textpage
+	echo "./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
+	./dwine bin/c2d.exe -t ${BIN}.textpage ${MON} ${BIN}.dsk 2>&1 | sed 's/^/    /'
 	CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
 	if [ "$CHECK" = "$SUM" ]
 	then