diff --git a/build.php b/build.php
index 4b993e5953d9d82a2446131b2255fbe7882b3e75..091e17c18a0e0811ddbb13bfc1f23f764e474141 100755
--- a/build.php
+++ b/build.php
@@ -7,7 +7,9 @@ require("inc_functions.php");
 $INFILE="$selfdir/src/amcli.php";
 $INCFILE="$selfdir/src/include_checks.php";
 $TMPFILE="$selfdir/src/amcli.php.tmp";
-$OUTFILE="$selfdir/$dirPackages/".str_replace('.php', '', basename($INFILE));
+
+$OUTFILE="$selfdir/$dirPackages/".str_replace('.php', '', basename($INFILE)).$myosextension;
+$OUTFILE2="$selfdir/$dirPackages/".str_replace('.php', '', basename($INFILE)).'_'.$myarchitecture.$myosextension;
 
 
 echo "
@@ -68,11 +70,9 @@ _h1("Test generated binary");
 _exec("file '$OUTFILE'");
 _exec("'$OUTFILE' --ini=../src/simple.ini");
 
-_h1("Test binary in other location");
-$testfile="/tmp/".basename($OUTFILE);
-_exec("cp '$OUTFILE' '$testfile'");
-_exec("'$testfile' --ini=$selfdir/src/simple.ini");
-_exec("rm '$testfile'");
+_h1("Write architecture specific binary");
+_exec("cp '$OUTFILE' '$OUTFILE2'");
+
 
 // ----------------------------------------------------------------------