diff --git a/easybuild/build.py b/easybuild/build.py
index d4d26d17da..91beed0ddb 100644
--- a/easybuild/build.py
+++ b/easybuild/build.py
@@ -34,7 +34,6 @@
 from easybuild.tools.modules import Modules, searchModule
 from easybuild.tools.repository import getRepository
 from optparse import OptionParser
-import easybuild
 import easybuild.tools.config as config
 import easybuild.tools.filetools as filetools
 from easybuild.tools import systemtools
@@ -671,7 +670,7 @@ def build(module, options, log, origEnviron, exitOnFailure=True):
     ## Check for errors
     if exitCode > 0 or filetools.errorsFoundInLog > 0:
         print_msg("\nWARNING: Build exited with exit code %d. %d possible error(s) were detected in the " \
-                  "build logs, please verify the build.\n" % (exitCode, filetools.errorsFoundInLog), 
+                  "build logs, please verify the build.\n" % (exitCode, filetools.errorsFoundInLog),
                   log)
 
     if app.postmsg:
diff --git a/easybuild.sh b/eb
similarity index 96%
rename from easybuild.sh
rename to eb
index 2f69593220..6f3e672491 100755
--- a/easybuild.sh
+++ b/eb
@@ -30,7 +30,7 @@ cd - > /dev/null
 
 export PYTHONPATH="${absolute_path}:$PYTHONPATH"
 if [[ "$version" = "2.4" ]]; then
-  python "`dirname $0`/easybuild/build.py" $@
+  python "`dirname $0`easybuild/build.py" $@
 else
   python -m easybuild.build $@
 fi