diff --git a/build/build.mk b/build/build.mk
index 1d285bf2004..eb71d959af5 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -20,7 +20,7 @@
 # Makefile to generate build tools
 #
 
-ZENDDIR = $(shell if test -d "ZendEngine2"; then echo ZendEngine2; else echo Zend; fi)
+ZENDDIR = Zend
 
 SUBDIRS = $(ZENDDIR) TSRM
 
diff --git a/buildconf b/buildconf
index c3530e86146..957f3916b29 100755
--- a/buildconf
+++ b/buildconf
@@ -7,6 +7,10 @@ if test "$supplied_flag" = "--copy"; then
     automake_flags=--copy
 fi
 
+if test -d "ZendEngine2"; then
+    mv ZendEngine2 Zend
+fi
+
 ## build.mk does not check aclocal exit status yet
 ##
 #mv aclocal.m4 aclocal.m4.old 2>/dev/null