diff --git a/README b/README
index dc985a834c315310aee07a2dda67a170b420e14b..ea0c882dff78a040e586ecd0bfe7f9d23e4e5f1d 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-Qt Creator 2.1.81
-===============
+Qt Creator
+==========
 Qt Creator is a crossplatform C++ IDE for development with the Qt framework.
 
 Supported Platforms
diff --git a/doc/doc.pri b/doc/doc.pri
index 8cf07f2c35bfa3d416b68433ca264d9155911eb3..cf433f098746fdd67968a4ab4ea1e4d282bc4d6c 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,14 +1,18 @@
 QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3)
 HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator)
 
+VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", )
+
 equals(QMAKE_DIR_SEP, /) {   # unix, mingw+msys
-    QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN
+    QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN
 } else:win32-g++* {   # just mingw
     # The lack of spaces in front of the && is necessary!
-    QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
+    QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QTC_VERSION=$$QTCREATOR_VERSION&& set QTC_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN
 } else {   # nmake
     QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \
            set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \
+           set QTC_VERSION=$$QTCREATOR_VERSION $$escape_expand(\\n\\t) \
+           set QTC_VERSION_TAG=$$VERSION_TAG $$escape_expand(\\n\\t) \
            $$QDOC_BIN
 }
 
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 2082a077e7787de22656d9369822d45b2497cbcb..f43c1b6cfa7cb251082319d8b8c9f1a29c1be0d1 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -39,7 +39,7 @@
 
     \title Qt Creator Manual
 
-    \section1 Version 2.1.81
+    \section1 Version \qtcversion
 
     Qt Creator provides a cross-platform, complete integrated development
     environment (IDE) for application developers to create applications for
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index 6672a40903c1f3bcfe4035a8e2eb66345f302cf9..9e8df7cefaa7d62500ef3b91c095f74eacf9eb75 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -20,12 +20,12 @@ sources.fileextensions  = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressb
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.2181
+qhp.QtCreator.namespace        = com.nokia.qtcreator.$QTC_VERSION_TAG
 qhp.QtCreator.virtualFolder    = doc
 qhp.QtCreator.indexTitle       = Qt Creator
-qhp.QtCreator.filterAttributes = qtcreator 2.1.81
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.1.81
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.1.81
+qhp.QtCreator.filterAttributes = qtcreator $QTC_VERSION
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator $QTC_VERSION
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator $QTC_VERSION
 qhp.QtCreator.indexRoot        =
 qhp.QtCreator.extraFiles       = style/style.css \
                           style/style_ie6.css \
@@ -66,6 +66,8 @@ qhp.QtCreator.subprojects.manual.type = manual
 
 # macros.qdocconf
 
+macro.qtcversion        = $QTC_VERSION
+
 macro.aring.HTML        = "å"
 macro.Auml.HTML         = "Ä"
 macro.author            = "\\bold{Author:}"
diff --git a/qtcreator.pri b/qtcreator.pri
index f1a9f6af50e35f3f41e8aabe33d8df380019dc07..01175dbe59005b7af8dfb5aeecf33022cc4c0618 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -1,6 +1,8 @@
 !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
 QTCREATOR_PRI_INCLUDED = 1
 
+QTCREATOR_VERSION = 2.1.81
+
 defineReplace(cleanPath) {
     win32:1 ~= s|\\\\|/|g
     contains(1, ^/.*):pfx = /
diff --git a/scripts/replaceVersion.sh b/scripts/replaceVersion.sh
deleted file mode 100755
index 0e7dc87ebe1a3ededaad5c09220cba076d0ccebc..0000000000000000000000000000000000000000
--- a/scripts/replaceVersion.sh
+++ /dev/null
@@ -1,138 +0,0 @@
-#! /usr/bin/env bash
-
-## Command line parameters
-if [[ $# != 2 ]]; then
-    cat <<USAGE
-usage:
-  $0 <old> <new>
-example:
-  $0 '1.2.3' '1.2.4'
-USAGE
-    exit 1
-fi
-
-
-## Process and show version
-OLD=`sed 's/\./\\\\./g' <<<"$1"`
-NEW=`sed 's/\./\\\\./g' <<<"$2"`
-
-OLD_MAJOR=`sed 's/^\([0-9]*\)\.[0-9]*\.[0-9]*/\1/' <<<"$1"`
-NEW_MAJOR=`sed 's/^\([0-9]*\)\.[0-9]*\.[0-9]*/\1/' <<<"$2"`
-
-OLD_MINOR=`sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*/\1/' <<<"$1"`
-NEW_MINOR=`sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*/\1/' <<<"$2"`
-
-OLD_RELEASE=`sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\)/\1/' <<<"$1"`
-NEW_RELEASE=`sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\)/\1/' <<<"$2"`
-
-OLD_THREE="${OLD_MAJOR}${OLD_MINOR}${OLD_RELEASE}"
-NEW_THREE="${NEW_MAJOR}${NEW_MINOR}${NEW_RELEASE}"
-
-OLD_DOT_THREE="${OLD_MAJOR}\\.${OLD_MINOR}\\.${OLD_RELEASE}"
-NEW_DOT_THREE="${NEW_MAJOR}\\.${NEW_MINOR}\\.${NEW_RELEASE}"
-
-OLD_DOT_FOUR="${OLD_MAJOR}\\.${OLD_MINOR}\\.${OLD_RELEASE}\\.0"
-NEW_DOT_FOUR="${NEW_MAJOR}\\.${NEW_MINOR}\\.${NEW_RELEASE}\\.0"
-
-OLD_COMMA_FOUR="${OLD_MAJOR},${OLD_MINOR},${OLD_RELEASE},0"
-NEW_COMMA_FOUR="${NEW_MAJOR},${NEW_MINOR},${NEW_RELEASE},0"
-
-echo "#==============================================="
-echo "# Plain    '${OLD}'     -> '${NEW}'"
-echo "#-----------------------------------------------"
-echo "# Major    '${OLD_MAJOR}'           -> '${NEW_MAJOR}'"
-echo "# Minor    '${OLD_MINOR}'           -> '${NEW_MINOR}'"
-echo "# Release  '${OLD_RELEASE}'           -> '${NEW_RELEASE}'"
-echo "#-----------------------------------------------"
-echo "# 3        '${OLD_THREE}'         -> '${NEW_THREE}'"
-echo "# Dot 3    '${OLD_DOT_THREE}'     -> '${NEW_DOT_THREE}'"
-echo "# Dot 4    '${OLD_DOT_FOUR}'  -> '${NEW_DOT_FOUR}'"
-echo "# Comma 4  '${OLD_COMMA_FOUR}'     -> '${NEW_COMMA_FOUR}'"
-echo "#==============================================="
-echo
-
-
-## Make script safe to call from anywhere by going home first
-SCRIPT_DIR=`dirname "${PWD}/$0"`/..
-echo "Entering directory \`${SCRIPT_DIR}'"
-pushd "${SCRIPT_DIR}" &>/dev/null || exit 1
-
-
-## Patch *.pluginspec
-while read i ; do
-    echo "Patching \`$i'"
-    TMPFILE=`mktemp versionPatch.XXXXXX`
-    sed -e 's/version="'"${OLD}"'"/version="'"${NEW}"'"/' \
-            -e 's/compatVersion="'"${OLD}"'"/compatVersion="'"${NEW}"'"/' \
-            "${i}" > "${TMPFILE}"
-    mv -f "${TMPFILE}" "${i}"
-done < <(find . -name '*.pluginspec')
-
-
-## Patch coreconstants.h
-TMPFILE=`mktemp versionPatch.XXXXXX`
-CORE_CONSTANT_H="${SCRIPT_DIR}/src/plugins/coreplugin/coreconstants.h"
-echo "Patching \`${CORE_CONSTANT_H}'"
-sed \
-        -e 's/^\(#define IDE_VERSION_MAJOR \)'"${OLD_MAJOR}"'/\1'"${NEW_MAJOR}"'/' \
-        -e 's/^\(#define IDE_VERSION_MINOR \)'"${OLD_MINOR}"'/\1'"${NEW_MINOR}"'/' \
-        -e 's/^\(#define IDE_VERSION_RELEASE \)'"${OLD_RELEASE}"'/\1'"${NEW_RELEASE}"'/' \
-    "${CORE_CONSTANT_H}" > "${TMPFILE}"
-mv -f "${TMPFILE}" "${CORE_CONSTANT_H}"
-
-
-## Patch Info.plist
-TMPFILE=`mktemp versionPatch.XXXXXX`
-INFO_PLIST="${SCRIPT_DIR}/src/app/Info.plist"
-echo "Patching \`${INFO_PLIST}'"
-sed \
-        -e "s/"${OLD}"/"${NEW}"/" \
-    "${INFO_PLIST}" > "${TMPFILE}"
-mv -f "${TMPFILE}" "${INFO_PLIST}"
-
-
-## Patch qtcreator.qdocconf
-TMPFILE=`mktemp versionPatch.XXXXXX`
-QDOCCONF="${SCRIPT_DIR}/doc/qtcreator.qdocconf"
-echo "Patching \`${QDOCCONF}'"
-sed \
-        -e "s/"${OLD_DOT_THREE}"/"${NEW_DOT_THREE}"/" \
-        -e "s/"${OLD_THREE}"/"${NEW_THREE}"/" \
-    "${QDOCCONF}" > "${TMPFILE}"
-mv -f "${TMPFILE}" "${QDOCCONF}"
-
-## Patch qt-html-templates.qdocconf
-TMPFILE=`mktemp versionPatch.XXXXXX`
-QDOCCONF="${SCRIPT_DIR}/doc/qt-html-templates.qdocconf"
-echo "Patching \`${QDOCCONF}'"
-sed \
-        -e "s/"${OLD_DOT_THREE}"/"${NEW_DOT_THREE}"/" \
-        -e "s/"${OLD_THREE}"/"${NEW_THREE}"/" \
-    "${QDOCCONF}" > "${TMPFILE}"
-mv -f "${TMPFILE}" "${QDOCCONF}"
-
-
-## Patch qtcreator.qdoc
-TMPFILE=`mktemp versionPatch.XXXXXX`
-QDOC="${SCRIPT_DIR}/doc/qtcreator.qdoc"
-echo "Patching \`${QDOC}'"
-sed \
-        -e 's/'${OLD_DOT_THREE}'/'${NEW_DOT_THREE}'/' \
-    "${QDOC}" > "${TMPFILE}"
-mv -f "${TMPFILE}" "${QDOC}"
-
-
-## Patch README
-TMPFILE=`mktemp versionPatch.XXXXXX`
-README="${SCRIPT_DIR}/README"
-echo "Patching \`${README}'"
-sed \
-        -e 's/'${OLD_DOT_THREE}'/'${NEW_DOT_THREE}'/' \
-    "${README}" > "${TMPFILE}"
-mv -f "${TMPFILE}" "${README}"
-
-
-## Go back to original $PWD
-echo "Leaving directory \`${SCRIPT_DIR}'"
-popd &>/dev/null || exit 1
-exit 0
diff --git a/src/app/Info.plist b/src/app/Info.plist.in
similarity index 98%
rename from src/app/Info.plist
rename to src/app/Info.plist.in
index ce122da3a21fa211a3a00743c70b147b131f102f..589a77e8c2426659c448ebfffc615948edaac158 100644
--- a/src/app/Info.plist
+++ b/src/app/Info.plist.in
@@ -212,8 +212,8 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.nokia.qtcreator</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.81</string>
+	<string>$$QTCREATOR_VERSION</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.81</string>
+	<string>$$QTCREATOR_VERSION</string>
 </dict>
 </plist>
diff --git a/src/app/app.pro b/src/app/app.pro
index f86433d6af5589008eb75b6e6c516f44a6d37a77..8c856d7ed4bc3d968df9401120a2c35a775442cf 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -31,4 +31,6 @@ win32 {
     INSTALLS    += target
 }
 
-OTHER_FILES += qtcreator.rc Info.plist
+OTHER_FILES += qtcreator.rc Info.plist.in
+
+QMAKE_SUBSTITUTES = Info.plist.in
diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec.in
similarity index 79%
rename from src/plugins/bineditor/BinEditor.pluginspec
rename to src/plugins/bineditor/BinEditor.pluginspec.in
index 0755010e7561e013f4f50d4fe0bba7a6ccd24678..c6d211c956d37c49e35e6d8e9953f647bc306747 100644
--- a/src/plugins/bineditor/BinEditor.pluginspec
+++ b/src/plugins/bineditor/BinEditor.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="BinEditor" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"BinEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,7 +14,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Binary editor component.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec.in
similarity index 74%
rename from src/plugins/bookmarks/Bookmarks.pluginspec
rename to src/plugins/bookmarks/Bookmarks.pluginspec.in
index 9c659c274b6bbf01e7db3d73b14ae9673cab1304..1d62cd7554740e37df5aeddcedad2c10e81ef224 100644
--- a/src/plugins/bookmarks/Bookmarks.pluginspec
+++ b/src/plugins/bookmarks/Bookmarks.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Bookmarks" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Bookmarks\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Bookmarks in text editors.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/classview/ClassView.pluginspec b/src/plugins/classview/ClassView.pluginspec.in
similarity index 70%
rename from src/plugins/classview/ClassView.pluginspec
rename to src/plugins/classview/ClassView.pluginspec.in
index 77f765739486d51af88b3dcbaeb34b0da18898cc..1eab2b9ab4945f8b0aa8dc70f4bca2834741e585 100644
--- a/src/plugins/classview/ClassView.pluginspec
+++ b/src/plugins/classview/ClassView.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="ClassView" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"ClassView\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Denis Mingulov</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Class View component.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="CppTools" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
similarity index 69%
rename from src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
rename to src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
index 2719a920a5f3af18b05bae822eff0ed7eedefec2..325ab90e23bbb5d9cef5c2ef00cb4bb55ec91d93 100644
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="CMakeProjectManager" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"CMakeProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>CMake support</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="CppTools" version="2.1.81"/>
-        <dependency name="Designer" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Designer\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec.in
similarity index 83%
rename from src/plugins/coreplugin/Core.pluginspec
rename to src/plugins/coreplugin/Core.pluginspec.in
index 6ca42b8d8054686bc9a73a39cc3060234db45ebd..64acea4e8ae7437f263ef4d3ef6d98f1006c8705 100644
--- a/src/plugins/coreplugin/Core.pluginspec
+++ b/src/plugins/coreplugin/Core.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Core" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Core\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>The core plugin for the Qt IDE.</description>
     <url>http://qt.nokia.com</url>
     <argumentList>
-        <argument name="-color" parameter="color">Override selected UI color</argument>
+        <argument name=\"-color\" parameter=\"color\">Override selected UI color</argument>
     </argumentList>
 </plugin>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index af2e8e44b4a0a719dc34f713d0317184d5dad340..031b8ae8b657e74fa7743c31d53be280549d3ddf 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -35,9 +35,7 @@
 namespace Core {
 namespace Constants {
 
-#define IDE_VERSION_MAJOR 2
-#define IDE_VERSION_MINOR 1
-#define IDE_VERSION_RELEASE 81
+#include "ide_version.h"
 
 #define STRINGIFY_INTERNAL(x) #x
 #define STRINGIFY(x) STRINGIFY_INTERNAL(x)
diff --git a/src/plugins/coreplugin/coreplugin.pri b/src/plugins/coreplugin/coreplugin.pri
index 26143cbc129b0ad08cd44ff9e44a4b5e4e175984..eaff7803bb4d89e6457f2153f2428085a2fccc90 100644
--- a/src/plugins/coreplugin/coreplugin.pri
+++ b/src/plugins/coreplugin/coreplugin.pri
@@ -1,2 +1,5 @@
 include(coreplugin_dependencies.pri)
 LIBS *= -l$$qtLibraryName(Core)
+# for ide_version.h
+INCLUDEPATH += $$IDE_BUILD_TREE/src/plugins/coreplugin
+DEPENDPATH += $$IDE_BUILD_TREE/src/plugins/coreplugin
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 2bc24e65f38fb3c1579679a762d26189e07b3bb2..711f8297e49ba80b8b1efd6fe121f6df7f71c3fc 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -248,4 +248,6 @@ else:unix {
     images.path = /share/pixmaps
     INSTALLS += images
 }
-OTHER_FILES += editormanager/BinFiles.mimetypes.xml
+OTHER_FILES += editormanager/BinFiles.mimetypes.xml ide_version.h.in
+
+QMAKE_SUBSTITUTES += ide_version.h.in
diff --git a/src/plugins/coreplugin/ide_version.h.in b/src/plugins/coreplugin/ide_version.h.in
new file mode 100644
index 0000000000000000000000000000000000000000..2d28fac7dbe7c28472bb3235824e745299d53d95
--- /dev/null
+++ b/src/plugins/coreplugin/ide_version.h.in
@@ -0,0 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#define IDE_VERSION_MAJOR $$replace(QTCREATOR_VERSION, "^(\\d+)\\.\\d+\\.\\d+(-.*)?$", \\1)
+#define IDE_VERSION_MINOR $$replace(QTCREATOR_VERSION, "^\\d+\\.(\\d+)\\.\\d+(-.*)?$", \\1)
+#define IDE_VERSION_RELEASE $$replace(QTCREATOR_VERSION, "^\\d+\\.\\d+\\.(\\d+)(-.*)?$", \\1)
diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec.in
similarity index 79%
rename from src/plugins/cpaster/CodePaster.pluginspec
rename to src/plugins/cpaster/CodePaster.pluginspec.in
index 83acf7dd635f9469a398fa4825c16f3e89fc64b1..4fce7383326d7386435cd2a5fd726957c1686b38 100644
--- a/src/plugins/cpaster/CodePaster.pluginspec
+++ b/src/plugins/cpaster/CodePaster.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="CodePaster" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"CodePaster\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -13,7 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Codepaster plugin for pushing/fetching diff from server</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec.in
similarity index 75%
rename from src/plugins/cppeditor/CppEditor.pluginspec
rename to src/plugins/cppeditor/CppEditor.pluginspec.in
index 9c2a2b1601c6053f748c49e64dc636726ed9c981..bdb82452e8eb3f016fcc3243bd2258ecb335597b 100644
--- a/src/plugins/cppeditor/CppEditor.pluginspec
+++ b/src/plugins/cppeditor/CppEditor.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="CppEditor" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>C/C++ editor component.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="CppTools" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec.in
similarity index 70%
rename from src/plugins/cpptools/CppTools.pluginspec
rename to src/plugins/cpptools/CppTools.pluginspec.in
index b62c9e5dff137a72d1fb76fe5a04977e1dd3855c..704a64f4506aa1d5fcd99ef4adba19f75f2bf0fe 100644
--- a/src/plugins/cpptools/CppTools.pluginspec
+++ b/src/plugins/cpptools/CppTools.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="CppTools" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"CppTools\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Tools for analyzing C/C++ code.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Locator" version="2.1.81"/>
-        <dependency name="Find" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cvs/CVS.pluginspec b/src/plugins/cvs/CVS.pluginspec.in
similarity index 71%
rename from src/plugins/cvs/CVS.pluginspec
rename to src/plugins/cvs/CVS.pluginspec.in
index 47e49e4686f8cd87f490a206031f7fda09e881c4..d2b35efbebe30a6e2cf1f20ff38448229e364ff1 100644
--- a/src/plugins/cvs/CVS.pluginspec
+++ b/src/plugins/cvs/CVS.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="CVS" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"CVS\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>CVS integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="VCSBase" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec
deleted file mode 100644
index d2050b61278473425274eb3341346b874a1357da..0000000000000000000000000000000000000000
--- a/src/plugins/debugger/Debugger.pluginspec
+++ /dev/null
@@ -1,30 +0,0 @@
-<plugin name="Debugger" version="2.1.81" compatVersion="2.1.81">
-    <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2010 Nokia Corporation</copyright>
-    <license>
-Commercial Usage
-
-Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia.
-
-GNU Lesser General Public License Usage
-
-Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation.  Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-    </license>
-    <category>Qt Creator</category>
-    <description>Debugger integration.</description>
-    <url>http://qt.nokia.com</url>
-    <dependencyList>
-        <dependency name="CppEditor" version="2.1.81"/><!-- Debugger plugin adds items to the editor's context menu -->
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="Find" version="2.1.81"/>
-    </dependencyList>
-    <argumentList>
-        <argument name="-disable-cdb">Disable Cdb debugger engine</argument>
-        <argument name="-disable-gdb">Disable Gdb debugger engine</argument>
-        <argument name="-disable-sdb">Disable Qt Script debugger engine</argument>
-        <argument name="-disable-tcf">Disable Tcf debugger engine</argument>
-        <argument name="-debug" parameter="pid-or-corefile">Attach to Process-Id or Core file</argument>
-        <argument name="-wincrashevent" parameter="event-handle">Event handle used for attaching to crashed processes</argument>
-    </argumentList>
-</plugin>
diff --git a/src/plugins/debugger/Debugger.pluginspec.in b/src/plugins/debugger/Debugger.pluginspec.in
new file mode 100644
index 0000000000000000000000000000000000000000..565da29a3947b6ce17542eb6612fdf5044e17e9d
--- /dev/null
+++ b/src/plugins/debugger/Debugger.pluginspec.in
@@ -0,0 +1,30 @@
+<plugin name=\"Debugger\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
+    <vendor>Nokia Corporation</vendor>
+    <copyright>(C) 2010 Nokia Corporation</copyright>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation.  Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+    </license>
+    <category>Qt Creator</category>
+    <description>Debugger integration.</description>
+    <url>http://qt.nokia.com</url>
+    <dependencyList>
+        <dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\"/><!-- Debugger plugin adds items to the editor's context menu -->
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
+    </dependencyList>
+    <argumentList>
+        <argument name=\"-disable-cdb\">Disable Cdb debugger engine</argument>
+        <argument name=\"-disable-gdb\">Disable Gdb debugger engine</argument>
+        <argument name=\"-disable-sdb\">Disable Qt Script debugger engine</argument>
+        <argument name=\"-disable-tcf\">Disable Tcf debugger engine</argument>
+        <argument name=\"-debug\" parameter=\"pid-or-corefile\">Attach to Process-Id or Core file</argument>
+        <argument name=\"-wincrashevent\" parameter=\"event-handle\">Event handle used for attaching to crashed processes</argument>
+    </argumentList>
+</plugin>
diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec.in
similarity index 76%
rename from src/plugins/designer/Designer.pluginspec
rename to src/plugins/designer/Designer.pluginspec.in
index 3f6e81ea869fd4154de75fc1075feb45414c311a..e917a2e81a33439ac8734b3160b13a24b88421a1 100644
--- a/src/plugins/designer/Designer.pluginspec
+++ b/src/plugins/designer/Designer.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Designer" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Designer\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Qt Designer integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
 <!-- For compiling with CPP support enabled -->
-        <dependency name="CppTools" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/fakevim/FakeVim.pluginspec b/src/plugins/fakevim/FakeVim.pluginspec.in
similarity index 67%
rename from src/plugins/fakevim/FakeVim.pluginspec
rename to src/plugins/fakevim/FakeVim.pluginspec.in
index d68f79f50904761f6b1737056985eecb87130326..3a3570a484ddc9bfc3c10b588f2e9894dcd1bc5c 100644
--- a/src/plugins/fakevim/FakeVim.pluginspec
+++ b/src/plugins/fakevim/FakeVim.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="FakeVim" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"FakeVim\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -13,9 +13,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>VI-style keyboard navigation.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="CppEditor" version="2.1.81"/><!-- Plugin adds items to the editor's context menu -->
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\"/><!-- Plugin adds items to the editor's context menu -->
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec.in
similarity index 86%
rename from src/plugins/find/Find.pluginspec
rename to src/plugins/find/Find.pluginspec.in
index d9263df3f60f34c9290a0e33f9ec83c6f860ab20..7fb4144b438f13ea6ce13d09e2639c0eb8dbb17d 100644
--- a/src/plugins/find/Find.pluginspec
+++ b/src/plugins/find/Find.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Find" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Find\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Provides the find widget and the hooks for find implementations.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
similarity index 73%
rename from src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
rename to src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
index 89808c9a922a9c387e883d4702e3078a227c6125..3b77ffeba727f226dfdd0d60dd41e2e14e6edeca 100644
--- a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
+++ b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="GenericProjectManager" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"GenericProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Generic support</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="CppTools" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec.in
similarity index 71%
rename from src/plugins/git/ScmGit.pluginspec
rename to src/plugins/git/ScmGit.pluginspec.in
index f1a87589de4fc7aa1693cf9e67d3f6bfcfaf3a10..d81d4d473148299fbd3c32a6fe3df510efada350 100644
--- a/src/plugins/git/ScmGit.pluginspec
+++ b/src/plugins/git/ScmGit.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="ScmGit" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"ScmGit\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Git integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="VCSBase" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec.in
similarity index 82%
rename from src/plugins/helloworld/HelloWorld.pluginspec
rename to src/plugins/helloworld/HelloWorld.pluginspec.in
index f2b06679bd0fb6d5f82c7e787332c4e59973e3fa..0bdabd0118b25b8e9b41448366162a554bf9e259 100644
--- a/src/plugins/helloworld/HelloWorld.pluginspec
+++ b/src/plugins/helloworld/HelloWorld.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="HelloWorld" version="2.1.81" compatVersion="2.1.81" experimental="true">
+<plugin name=\"HelloWorld\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"true\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -13,6 +13,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Hello World sample plugin.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec.in
similarity index 75%
rename from src/plugins/help/Help.pluginspec
rename to src/plugins/help/Help.pluginspec.in
index fc80949bf40d70b1ec8934d5c962cfbdc0ffb05e..cbaaea2f52dd16387670a25ebe716504686d6459 100644
--- a/src/plugins/help/Help.pluginspec
+++ b/src/plugins/help/Help.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Help" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Help\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Help system.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="Find" version="2.1.81"/>
-        <dependency name="Locator" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/imageviewer/ImageViewer.pluginspec b/src/plugins/imageviewer/ImageViewer.pluginspec.in
similarity index 84%
rename from src/plugins/imageviewer/ImageViewer.pluginspec
rename to src/plugins/imageviewer/ImageViewer.pluginspec.in
index d4a01b072804b686c50b93e8e43895c048ba6166..8cead354bed494cc5545772060753d6c74a9a723 100644
--- a/src/plugins/imageviewer/ImageViewer.pluginspec
+++ b/src/plugins/imageviewer/ImageViewer.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="ImageViewer" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"ImageViewer\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Denis Mingulov</copyright>
     <license>
@@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Image Viewer component.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/locator/Locator.pluginspec b/src/plugins/locator/Locator.pluginspec.in
similarity index 85%
rename from src/plugins/locator/Locator.pluginspec
rename to src/plugins/locator/Locator.pluginspec.in
index 96ca3145d6b03a52927d0be2e8e47cae8aed7862..d6a99570fb99cf50a66eacdc4ec0e02b871f8198 100644
--- a/src/plugins/locator/Locator.pluginspec
+++ b/src/plugins/locator/Locator.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Locator" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Locator\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Provides the Locator widget and the hooks for Locator filter implementations.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/mercurial/Mercurial.pluginspec b/src/plugins/mercurial/Mercurial.pluginspec.in
similarity index 71%
rename from src/plugins/mercurial/Mercurial.pluginspec
rename to src/plugins/mercurial/Mercurial.pluginspec.in
index 473be1f488571d5a665c4f86effe344997586ae3..8ff246b0de42359952a13c894e9bab44f062d1ce 100644
--- a/src/plugins/mercurial/Mercurial.pluginspec
+++ b/src/plugins/mercurial/Mercurial.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Mercurial" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Mercurial\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Brian McGillion</vendor>
     <copyright>(C) 2008-2009 Brian McGillion</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Mercurial integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="VCSBase" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec.in
similarity index 71%
rename from src/plugins/perforce/Perforce.pluginspec
rename to src/plugins/perforce/Perforce.pluginspec.in
index 7229d18ce9a84d3fe3a4c44891f1849426724d22..7a48f4335197de68ebdc7f5aef9687df3c8c886a 100644
--- a/src/plugins/perforce/Perforce.pluginspec
+++ b/src/plugins/perforce/Perforce.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Perforce" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Perforce\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Perforce integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="VCSBase" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
similarity index 65%
rename from src/plugins/projectexplorer/ProjectExplorer.pluginspec
rename to src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
index dceb775372411364fb56d7547b807e6b89eeea3b..f51d62df107c76e67ab06b1b022c22b681885a79 100644
--- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec
+++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="ProjectExplorer" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,13 +14,13 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="Find" version="2.1.81"/>
-        <dependency name="Locator" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
     <argumentList>
-        <argument name="-customwizard-verbose">Verbose loading of custom wizards</argument>
-        <argument name="-lastsession">Restore the last session</argument>
+        <argument name=\"-customwizard-verbose\">Verbose loading of custom wizards</argument>
+        <argument name=\"-lastsession\">Restore the last session</argument>
     </argumentList>
 </plugin>
diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec b/src/plugins/qmldesigner/QmlDesigner.pluginspec.in
similarity index 75%
rename from src/plugins/qmldesigner/QmlDesigner.pluginspec
rename to src/plugins/qmldesigner/QmlDesigner.pluginspec.in
index b6a2cca6b73d7390640b08cc858a1486d4cd070c..1f6c9bfde0992f228d0453ce05cd52be6669a0d2 100644
--- a/src/plugins/qmldesigner/QmlDesigner.pluginspec
+++ b/src/plugins/qmldesigner/QmlDesigner.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="QmlDesigner" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"QmlDesigner\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -20,8 +20,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Visual Designer for QML files.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="QmlJSEditor" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qmljseditor/QmlJSEditor.pluginspec b/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
similarity index 74%
rename from src/plugins/qmljseditor/QmlJSEditor.pluginspec
rename to src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
index adc6a03345b9cf7a79586fecba15b151c421f202..29c8c7ca3c0eb28861b73ba38c80760503a4a1d3 100644
--- a/src/plugins/qmljseditor/QmlJSEditor.pluginspec
+++ b/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="QmlJSEditor" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Editor for QML and JavaScript.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qmljsinspector/QmlJSInspector.pluginspec b/src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in
similarity index 62%
rename from src/plugins/qmljsinspector/QmlJSInspector.pluginspec
rename to src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in
index 712c90be5d191581522d281b9db9610830aa89f2..8fe76be835e335facd38c59c46f5f486a12faa30 100644
--- a/src/plugins/qmljsinspector/QmlJSInspector.pluginspec
+++ b/src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="QmlJSInspector" version="2.1.81" compatVersion="2.1.81" experimental="true">
+<plugin name=\"QmlJSInspector\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"true\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -20,11 +20,11 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Debugger for QML files</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="QmlProjectManager" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="CppTools" version="2.1.81"/>
-        <dependency name="CppEditor" version="2.1.81"/>
-        <dependency name="Debugger" version="2.1.81"/>
-        <dependency name="QmlJSEditor" version="2.1.81"/>
+        <dependency name=\"QmlProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
similarity index 65%
rename from src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
rename to src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
index 8e7d1a909d266095a1c0ee9777a11d070d7c65b0..249636e1fc3484de443af890d3bee18fd243c2cb 100644
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="QmlProjectManager" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"QmlProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,10 +14,10 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Qt Quick support</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="QmlJSEditor" version="2.1.81"/>
-        <dependency name="Debugger" version="2.1.81" />
-        <dependency name="Qt4ProjectManager" version="2.1.81" />
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\" />
+        <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\" />
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in
similarity index 67%
rename from src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
rename to src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in
index 6b0e5427957b1418bfec7f30dc4288c1a90e7497..3f03fb2b8363f96646535578b4b49c384e6ceeba 100644
--- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
+++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Qt4ProjectManager" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,10 +14,10 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Provides project type for Qt 4 pro files and tools.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="CppTools" version="2.1.81"/>
-        <dependency name="Designer" version="2.1.81"/>
-        <dependency name="Debugger" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Designer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec.in
similarity index 84%
rename from src/plugins/regexp/RegExp.pluginspec
rename to src/plugins/regexp/RegExp.pluginspec.in
index d23b473d7ad2320c97e90602005e4985447cf562..ff0059a677c0f883fe6a63420edad76faf8044c9 100644
--- a/src/plugins/regexp/RegExp.pluginspec
+++ b/src/plugins/regexp/RegExp.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="RegExp" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"RegExp\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -13,6 +13,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Regular Expression test widget.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in
similarity index 84%
rename from src/plugins/resourceeditor/ResourceEditor.pluginspec
rename to src/plugins/resourceeditor/ResourceEditor.pluginspec.in
index e7ecf2eeda7e37a99c3d8595068acdc73d127052..bdc02381f69dab0e33f9115fcfba43f73816ae47 100644
--- a/src/plugins/resourceeditor/ResourceEditor.pluginspec
+++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="ResourceEditor" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"ResourceEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Editor for qrc files.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec.in
similarity index 70%
rename from src/plugins/subversion/Subversion.pluginspec
rename to src/plugins/subversion/Subversion.pluginspec.in
index 67e1e2649386f1adc12f70802e652dabc9910557..8058678064e9b0417f0919bc253224891b75d603 100644
--- a/src/plugins/subversion/Subversion.pluginspec
+++ b/src/plugins/subversion/Subversion.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Subversion" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Subversion\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Subversion integration.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="VCSBase" version="2.1.81"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/tasklist/TaskList.pluginspec b/src/plugins/tasklist/TaskList.pluginspec.in
similarity index 79%
rename from src/plugins/tasklist/TaskList.pluginspec
rename to src/plugins/tasklist/TaskList.pluginspec.in
index b1a8eca3e4a7611c5a0c4e552edfc44ecf44d8c6..c266cc3a48a306f73ecb1d8d41856724056ade79 100644
--- a/src/plugins/tasklist/TaskList.pluginspec
+++ b/src/plugins/tasklist/TaskList.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="TaskList" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"TaskList\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -13,7 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Use .tasks-files to populate the build issues view.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-	<dependency name="ProjectExplorer" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+	<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec.in
similarity index 76%
rename from src/plugins/texteditor/TextEditor.pluginspec
rename to src/plugins/texteditor/TextEditor.pluginspec.in
index 1670ce1ca4098e1d0f5ce529e90f517003a9b62e..5f5bb701037d9a0f0bdc7d911163332b905a3f83 100644
--- a/src/plugins/texteditor/TextEditor.pluginspec
+++ b/src/plugins/texteditor/TextEditor.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="TextEditor" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Text editor framework and the implementation of the basic text editor.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="Find" version="2.1.81"/>
-        <dependency name="Locator" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec.in
similarity index 75%
rename from src/plugins/vcsbase/VCSBase.pluginspec
rename to src/plugins/vcsbase/VCSBase.pluginspec.in
index ee142de6c03d2851c51f00fcfa432233355fc58e..16af539d2b5414d0e0733ab50e33f5b699c50496 100644
--- a/src/plugins/vcsbase/VCSBase.pluginspec
+++ b/src/plugins/vcsbase/VCSBase.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="VCSBase" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Version Control System Base Plugin</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
-        <dependency name="TextEditor" version="2.1.81"/>
-        <dependency name="ProjectExplorer" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/welcome/Welcome.pluginspec b/src/plugins/welcome/Welcome.pluginspec.in
similarity index 85%
rename from src/plugins/welcome/Welcome.pluginspec
rename to src/plugins/welcome/Welcome.pluginspec.in
index 1b4c17425c258d009f3d5f7a77142a861c521ce0..092bb2f26398399822f4ff1f251b29fff156103b 100644
--- a/src/plugins/welcome/Welcome.pluginspec
+++ b/src/plugins/welcome/Welcome.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name="Welcome" version="2.1.81" compatVersion="2.1.81">
+<plugin name=\"Welcome\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>
@@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Default Welcome Screen Plugin</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name="Core" version="2.1.81"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index fc7b40ef07676e439fded1c932c09e3cab710483..2b98eb9e3d24c4cc3895c21ce0ce77b1ded2fe95 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -17,17 +17,30 @@ isEmpty(TARGET) {
     error("qtcreatorplugin.pri: You must provide a TARGET")
 }
 
-PLUGINSPECS = $${_PRO_FILE_PWD_}/$${TARGET}.pluginspec
-copy2build.input = PLUGINSPECS
-copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir}
+defineReplace(stripOutDir) {
+    1 ~= s|^$$re_escape($$OUT_PWD/)||$$i_flag
+    return($$1)
+}
+
+PLUGINSPEC = $$_PRO_FILE_PWD_/$${TARGET}.pluginspec
+PLUGINSPEC_IN = $${PLUGINSPEC}.in
+exists($$PLUGINSPEC_IN) {
+    OTHER_FILES += $$PLUGINSPEC_IN
+    PLUGINSPEC = $$OUT_PWD/$${TARGET}.pluginspec
+    QMAKE_SUBSTITUTES += $${PLUGINSPEC}.in
+    copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripOutDir}
+} else {
+    # need to support that for external plugins
+    OTHER_FILES += $$PLUGINSPEC
+    copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir}
+}
+copy2build.input = PLUGINSPEC
 isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
 copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 copy2build.name = COPY ${QMAKE_FILE_IN}
 copy2build.CONFIG += no_link
 QMAKE_EXTRA_COMPILERS += copy2build
 
-OTHER_FILES += $$PLUGINSPECS
-
 macx {
     !isEmpty(TIGER_COMPAT_MODE) {
         QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/