diff --git a/bin/qpsmtpd b/qpsmtpd
similarity index 100%
rename from bin/qpsmtpd
rename to qpsmtpd
diff --git a/bin/qpsmtpd-async b/qpsmtpd-async
similarity index 100%
rename from bin/qpsmtpd-async
rename to qpsmtpd-async
diff --git a/bin/qpsmtpd-forkserver b/qpsmtpd-forkserver
similarity index 100%
rename from bin/qpsmtpd-forkserver
rename to qpsmtpd-forkserver
diff --git a/bin/qpsmtpd-prefork b/qpsmtpd-prefork
similarity index 100%
rename from bin/qpsmtpd-prefork
rename to qpsmtpd-prefork
diff --git a/run.forkserver b/run.forkserver
index 64b9df3..2bdadbf 100755
--- a/run.forkserver
+++ b/run.forkserver
@@ -13,7 +13,7 @@ LANG=C
 exec 2>&1 \
 sh -c "
   exec $BIN/softlimit -m $MAXRAM   \
-    $PERL -T ./bin/qpsmtpd-forkserver  \
+    $PERL -T ./qpsmtpd-forkserver  \
       --listen-address $IP         \
       --port 25                    \
       --port 587                   \
diff --git a/run.tcpserver b/run.tcpserver
index ca543a2..d5b4c99 100755
--- a/run.tcpserver
+++ b/run.tcpserver
@@ -19,6 +19,6 @@ NOFILESGID=`id -g $QPUSER`
 exec $BIN/softlimit -m $MAXRAM  \
   $BIN/tcpserver -c 10 -v -R -p \
   -u $QMAILDUID -g $NOFILESGID $IP $PORT  \
-  ./bin/qpsmtpd 2>&1
+  ./qpsmtpd 2>&1
 # <end tcpserver>