diff --git a/.gitignore b/.gitignore
index 9487adc140d4399c1a2621251ef5816bfab0006e..8f3ba0e8541d81eea92fe1700e6919b5e5f2cef0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,7 +72,7 @@ src/xml/lib/
 # Binaries
 # --------
 bin/*.dll
-bin/qtcreator
+bin/qtcreator.bin
 bin/qtcreator.exe
 doc/qtcreator.qch
 tests/manual/cplusplus/cplusplus0
diff --git a/bin/qtcreator b/bin/qtcreator
new file mode 100755
index 0000000000000000000000000000000000000000..be657dcf8fae97447cf7f2e3548561cbfab0d7ce
--- /dev/null
+++ b/bin/qtcreator
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+"`dirname \"$0\"`/qtcreator.bin" ${1+"$@"}
diff --git a/src/qworkbench.pri b/src/qworkbench.pri
index 353846c6908ad9178dfeadc614db393af213e8f9..8116de8600261486d79ed9945d757b8fd6bb08eb 100644
--- a/src/qworkbench.pri
+++ b/src/qworkbench.pri
@@ -20,12 +20,13 @@ macx {
     IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH 
     contains(QT_CONFIG, ppc):CONFIG += ppc x86
 } else {
-    IDE_APP_TARGET   = qtcreator
+    IDE_APP_TARGET   = qtcreator.bin
     IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib/qtcreator
     IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins/
 }
 IDE_APP_PATH = $$IDE_BUILD_TREE/bin
 win32 {
+    IDE_APP_TARGET   = qtcreator
     IDE_LIBRARY_PATH ~= s|/+|\|
     IDE_APP_PATH ~= s|/+|\|
 }