diff --git a/build.xml b/build.xml
index e1b621cb..5b398963 100644
--- a/build.xml
+++ b/build.xml
@@ -84,6 +84,12 @@
                 <include name="**/*.php"/>
             </fileset>
         </copy>
+        <copy todir="${project.basedir}/build/phar/phpdraft/src/Psr/Log">
+            <fileset dir="vendor/psr/log/Psr/Log">
+                <include name="**/*.php"/>
+                <exclude name="**/*Test.php*"/>
+            </fileset>
+        </copy>
         <copy todir="${project.basedir}/build/phar/phpdraft">
             <fileset dir="${project.basedir}">
                 <include name="**/phpdraft"/>
@@ -165,6 +171,6 @@
     </target>
 
     <target name="-phar-determine-version">
-        <exec command="${project.basedir}/phpdraft --version | grep -ohE '([0-9]{1,}\.)+[0-9]{1,}'" outputproperty="version"/>
+        <exec command="php ${project.basedir}/phpdraft --version | grep -ohE '([0-9]{1,}\.)+[0-9]{1,}'" outputproperty="version"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/build/binary-phar-autoload.php.in b/build/binary-phar-autoload.php.in
index a7594c3e..1f82c926 100755
--- a/build/binary-phar-autoload.php.in
+++ b/build/binary-phar-autoload.php.in
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 if (version_compare('7.1.0', PHP_VERSION, '>')) {
     fwrite(
diff --git a/phpdraft b/phpdraft
index edd0029f..761e1804 100755
--- a/phpdraft
+++ b/phpdraft
@@ -1,4 +1,3 @@
-#!/usr/bin/env php
 <?php
 /**
  * Set up include path for source handling