diff --git a/qpsmtpd b/bin/qpsmtpd
similarity index 100%
rename from qpsmtpd
rename to bin/qpsmtpd
diff --git a/qpsmtpd-async b/bin/qpsmtpd-async
similarity index 100%
rename from qpsmtpd-async
rename to bin/qpsmtpd-async
diff --git a/qpsmtpd-forkserver b/bin/qpsmtpd-forkserver
similarity index 100%
rename from qpsmtpd-forkserver
rename to bin/qpsmtpd-forkserver
diff --git a/qpsmtpd-prefork b/bin/qpsmtpd-prefork
similarity index 100%
rename from qpsmtpd-prefork
rename to bin/qpsmtpd-prefork
diff --git a/run b/run
deleted file mode 100755
index 79f57ff..0000000
--- a/run
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# You might want/need to to edit these settings
-QPUSER=smtpd
-# limit qpsmtpd to 300MB memory
-MAXRAM=300000000
-BIN=/usr/local/bin
-PERL=/usr/bin/perl
-
-# You should not need to edit these.
-QMAILDUID=`id -u $QPUSER`
-NOFILESGID=`id -g $QPUSER`
-IP=`head -1 config/IP`
-PORT=25
-LANG=C
-
-# Remove the comments between the <start> and <end> tags to choose a
-# deployment model. See also: http://wiki.qpsmtpd.org/deploy:start
-
-# <start tcpserver>
-exec $BIN/softlimit -m $MAXRAM  \
-  $BIN/tcpserver -c 10 -v -R -p \
-  -u $QMAILDUID -g $NOFILESGID $IP $PORT  \
-  ./qpsmtpd 2>&1
-# <end tcpserver>
-
-
-# <start forkserver>
-#exec 2>&1 \
-#sh -c "
-#  exec $BIN/softlimit -m $MAXRAM   \
-#    $PERL -T ./qpsmtpd-forkserver  \
-#      --listen-address $IP         \
-#      --port $PORT                 \
-#      --port 587                   \
-#      --limit-connections 15       \
-#      --max-from-ip 5              \
-#      --user $QPUSER
-#"
-# <end forkserver>
diff --git a/run.forkserver b/run.forkserver
new file mode 100755
index 0000000..64b9df3
--- /dev/null
+++ b/run.forkserver
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+QPUSER=smtpd
+# limit qpsmtpd to 300MB memory
+MAXRAM=300000000
+BIN=/usr/local/bin
+PERL=/usr/bin/perl
+IP=0.0.0.0
+LANG=C
+
+# See also: http://wiki.qpsmtpd.org/deploy:start
+
+exec 2>&1 \
+sh -c "
+  exec $BIN/softlimit -m $MAXRAM   \
+    $PERL -T ./bin/qpsmtpd-forkserver  \
+      --listen-address $IP         \
+      --port 25                    \
+      --port 587                   \
+      --limit-connections 15       \
+      --max-from-ip 5              \
+      --user $QPUSER
+"
diff --git a/run.tcpserver b/run.tcpserver
new file mode 100755
index 0000000..ca543a2
--- /dev/null
+++ b/run.tcpserver
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+QPUSER=smtpd
+# limit qpsmtpd to 300MB memory
+MAXRAM=300000000
+BIN=/usr/local/bin
+PERL=/usr/bin/perl
+
+IP=`head -1 config/IP`
+PORT=25
+
+LANG=C
+QMAILDUID=`id -u $QPUSER`
+NOFILESGID=`id -g $QPUSER`
+
+# See also: http://wiki.qpsmtpd.org/deploy:start
+
+# <start tcpserver>
+exec $BIN/softlimit -m $MAXRAM  \
+  $BIN/tcpserver -c 10 -v -R -p \
+  -u $QMAILDUID -g $NOFILESGID $IP $PORT  \
+  ./bin/qpsmtpd 2>&1
+# <end tcpserver>
+