diff --git a/src/plugins/bineditor/bineditor.pro b/src/plugins/bineditor/bineditor.pro
index e7986d27b6c8cb2a81f87437c84d648d1c778fc2..0ccd43082923082cca7a6ac3be7e3727956726f0 100644
--- a/src/plugins/bineditor/bineditor.pro
+++ b/src/plugins/bineditor/bineditor.pro
@@ -11,5 +11,3 @@ SOURCES += bineditorplugin.cpp \
bineditor.cpp
RESOURCES +=
-
-OTHER_FILES += BinEditor.pluginspec
diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro
index 9d3ca71865479f444e19c5f164b19bb56ad48b9d..ec84fb75118404a9fe25923a5fd9a430bd11a6d7 100644
--- a/src/plugins/bookmarks/bookmarks.pro
+++ b/src/plugins/bookmarks/bookmarks.pro
@@ -16,5 +16,3 @@ SOURCES += bookmarksplugin.cpp \
bookmarkmanager.cpp
RESOURCES += bookmarks.qrc
-
-OTHER_FILES += Bookmarks.pluginspec
diff --git a/src/plugins/classview/classview.pro b/src/plugins/classview/classview.pro
index 944ca84927c83ca1147655bcea831b70f3ec8707..145bbc227f8c2aa7a2531fa3e607ff42780fcb56 100644
--- a/src/plugins/classview/classview.pro
+++ b/src/plugins/classview/classview.pro
@@ -28,9 +28,6 @@ SOURCES += \
classviewutils.cpp \
classviewtreeitemmodel.cpp
-OTHER_FILES += \
- ClassView.pluginspec
-
FORMS += \
classviewnavigationwidget.ui
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
index 1f54025a5e9953cd9896b16bb60126d4616860b6..370330860eb74291a8500d078d43260e9cb55648 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
@@ -32,5 +32,4 @@ SOURCES = cmakeproject.cpp \
RESOURCES += cmakeproject.qrc
FORMS +=
-OTHER_FILES += CMakeProjectManager.pluginspec \
- CMakeProject.mimetypes.xml
+OTHER_FILES += CMakeProject.mimetypes.xml
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index be7bee06ea7f6b80c446604a57c40538acf7d1d5..2bc24e65f38fb3c1579679a762d26189e07b3bb2 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -248,4 +248,4 @@ else:unix {
images.path = /share/pixmaps
INSTALLS += images
}
-OTHER_FILES += Core.pluginspec editormanager/BinFiles.mimetypes.xml
+OTHER_FILES += editormanager/BinFiles.mimetypes.xml
diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index 78db8ed3119d5598cf54df551ee1451d8ffb9d34..5eb1ef92e3c3373e4581059a8886f734986a3bc3 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/src/plugins/cppeditor/cppeditor.pro
@@ -40,5 +40,4 @@ SOURCES += cppplugin.cpp \
cppelementevaluator.cpp \
cppquickfixcollector.cpp
RESOURCES += cppeditor.qrc
-OTHER_FILES += CppEditor.pluginspec \
- CppEditor.mimetypes.xml
+OTHER_FILES += CppEditor.mimetypes.xml
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index be6a5cfde8a1c50d644e5901149e59438fd68509..57507f36126807a6e5775ef1201d7d41dcf72d7b 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -52,5 +52,3 @@ SOURCES += completionsettingspage.cpp \
FORMS += completionsettingspage.ui \
cppfilesettingspage.ui
-
-OTHER_FILES += CppTools.pluginspec
diff --git a/src/plugins/cvs/cvs.pro b/src/plugins/cvs/cvs.pro
index c4f6478e9332fb0d5e25cdfd79c8cdeb957b62ae..0f042def665812d49d79c17be5b06a13c6be3c95 100644
--- a/src/plugins/cvs/cvs.pro
+++ b/src/plugins/cvs/cvs.pro
@@ -34,5 +34,3 @@ SOURCES += annotationhighlighter.cpp \
FORMS += settingspage.ui
RESOURCES += cvs.qrc
-
-OTHER_FILES += CVS.pluginspec
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 0dcfe624d59279b58ef067826e82e9b47645a58d..39b78dd2a151218b18ffac0ce9355bb4c6153498 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -131,6 +131,3 @@ contains(QT_CONFIG, declarative) {
include(tcf/tcf.pri)
include(shared/shared.pri)
-
-
-OTHER_FILES += Debugger.pluginspec
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index 83b0ce035ddcd15a57e9be2cced561db0b62f653..043756957363adb27de56169596736bc147d57e2 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -62,4 +62,4 @@ SOURCES += formeditorplugin.cpp \
RESOURCES += designer.qrc
-OTHER_FILES += Designer.pluginspec Designer.mimetypes.xml README.txt
+OTHER_FILES += Designer.mimetypes.xml README.txt
diff --git a/src/plugins/fakevim/fakevim.pro b/src/plugins/fakevim/fakevim.pro
index adffef024e4161fa3a93006e12e435e1fc60b5b2..1c282309f19ec64aaa7e9ecfadda46cba5f787ca 100644
--- a/src/plugins/fakevim/fakevim.pro
+++ b/src/plugins/fakevim/fakevim.pro
@@ -21,4 +21,3 @@ HEADERS += fakevimactions.h \
fakevimsyntax.h \
fakevimplugin.h
FORMS += fakevimoptions.ui
-OTHER_FILES += FakeVim.pluginspec
diff --git a/src/plugins/find/find.pro b/src/plugins/find/find.pro
index d0f67a405c27e05e34a3fb257bdab4f9e2f00d70..c0c93d3625850bbd15a5e342eb59384a5292ab5f 100644
--- a/src/plugins/find/find.pro
+++ b/src/plugins/find/find.pro
@@ -32,5 +32,3 @@ SOURCES += findtoolwindow.cpp \
FORMS += findwidget.ui \
finddialog.ui
RESOURCES += find.qrc
-
-OTHER_FILES += Find.pluginspec
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro
index 0c3e3ee304b680bc616380132ba33bed46c6e901..48a51d874e300e759e7cda9fd84634675ef21095 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.pro
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.pro
@@ -25,4 +25,3 @@ SOURCES = genericproject.cpp \
genericbuildconfiguration.cpp
RESOURCES += genericproject.qrc
FORMS += genericmakestep.ui
-OTHER_FILES += GenericProjectManager.pluginspec
diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro
index 7ffe7d8999dc77d297b58f139a660fe75640a435..435519768ad321ddb6498f6e67b9643187575f32 100644
--- a/src/plugins/git/git.pro
+++ b/src/plugins/git/git.pro
@@ -48,7 +48,6 @@ FORMS += changeselectiondialog.ui \
gitsubmitpanel.ui \
branchdialog.ui \
stashdialog.ui
-OTHER_FILES += ScmGit.pluginspec
include(gitorious/gitorious.pri)
RESOURCES += \
diff --git a/src/plugins/helloworld/helloworld.pro b/src/plugins/helloworld/helloworld.pro
index aae13238683b103d3290f18877842f26b4325123..9ef9b48f333760ba49901c700c66149befedfbfa 100644
--- a/src/plugins/helloworld/helloworld.pro
+++ b/src/plugins/helloworld/helloworld.pro
@@ -9,5 +9,3 @@ HEADERS += helloworldplugin.h \
SOURCES += helloworldplugin.cpp \
helloworldwindow.cpp
-
-OTHER_FILES += helloworld.pluginspec
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index 451fc5d3d369fe33f2332e930b59ed68557d9fc9..137592e41dbed17e9a6e4076d05c3788f80d2688 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -64,5 +64,3 @@ include(../../shared/help/help.pri)
contains(QT_CONFIG, webkit) {
QT += webkit
}
-
-OTHER_FILES += Help.pluginspec
diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro
index 41d64bfb1121e378676100a7cef5d980b60a14ed..40a15d89b7f610d96773693651870e7d8bf53f33 100644
--- a/src/plugins/imageviewer/imageviewer.pro
+++ b/src/plugins/imageviewer/imageviewer.pro
@@ -24,7 +24,6 @@ RESOURCES += \
imageviewer.qrc
OTHER_FILES += \
- ImageViewer.pluginspec \
ImageViewer.mimetypes.xml
contains(QT_CONFIG, svg):QT += svg
diff --git a/src/plugins/locator/locator.pro b/src/plugins/locator/locator.pro
index 7844b742aaad545a060d5058a5aef597fd1dcf16..2d81975fa5695c8c70b190a1ca1a5f935bc59fd7 100644
--- a/src/plugins/locator/locator.pro
+++ b/src/plugins/locator/locator.pro
@@ -32,5 +32,3 @@ FORMS += settingspage.ui \
filesystemfilter.ui \
directoryfilter.ui
RESOURCES += locator.qrc
-
-OTHER_FILES += Locator.pluginspec
diff --git a/src/plugins/mercurial/mercurial.pro b/src/plugins/mercurial/mercurial.pro
index 9b52048b32a35f2f7e31441296e8e182f6658136..f532f20471d28d5a3fd78de4ef8791aac5d4582d 100644
--- a/src/plugins/mercurial/mercurial.pro
+++ b/src/plugins/mercurial/mercurial.pro
@@ -31,7 +31,6 @@ HEADERS += mercurialplugin.h \
clonewizardpage.h \
clonewizard.h \
mercurialsettings.h
-OTHER_FILES += Mercurial.pluginspec
FORMS += optionspage.ui \
revertdialog.ui \
srcdestdialog.ui \
diff --git a/src/plugins/perforce/perforce.pro b/src/plugins/perforce/perforce.pro
index 27d398f0f32641ed2aba33a4a67c8c3b80207739..7754b7fae50a2d8216719beb5f813822c9c61868 100644
--- a/src/plugins/perforce/perforce.pro
+++ b/src/plugins/perforce/perforce.pro
@@ -36,5 +36,3 @@ FORMS += settingspage.ui \
submitpanel.ui
RESOURCES += perforce.qrc
-
-OTHER_FILES += Perforce.pluginspec
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 3dd702f50b951adf7f7773da073aad960dca6ae5..d94d459d88fe03e53801a59cf294df9d29b0fc03 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -204,4 +204,3 @@ win32 {
}
RESOURCES += projectexplorer.qrc
DEFINES += PROJECTEXPLORER_LIBRARY
-OTHER_FILES += ProjectExplorer.pluginspec
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index 8d563ddf943c8470a4c947b7871da5471f530bd0..ad7cf4efbf945dbda004b40a389ca6ff93121f66 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -34,5 +34,3 @@ SOURCES += qmldesignerplugin.cpp \
styledoutputpaneplaceholder.cpp
FORMS += settingspage.ui
-
-OTHER_FILES += QmlDesigner.pluginspec
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro
index 2c3c302e2953e2ecf3708f64acba0c179210c49f..53c7ca2bc923232219c075e09b1c10477d16ca89 100644
--- a/src/plugins/qmljseditor/qmljseditor.pro
+++ b/src/plugins/qmljseditor/qmljseditor.pro
@@ -65,7 +65,7 @@ SOURCES += \
qmljssemantichighlighter.cpp
RESOURCES += qmljseditor.qrc
-OTHER_FILES += QmlJSEditor.pluginspec QmlJSEditor.mimetypes.xml
+OTHER_FILES += QmlJSEditor.mimetypes.xml
FORMS += \
quicktoolbarsettingspage.ui \
diff --git a/src/plugins/qmljsinspector/qmljsinspector.pro b/src/plugins/qmljsinspector/qmljsinspector.pro
index 3ae7bab149d24c7c7ca45dbb67b33eb5a6f45082..61e71483f3c603580409fcac5ee45ffad48f6e1f 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.pro
+++ b/src/plugins/qmljsinspector/qmljsinspector.pro
@@ -35,7 +35,6 @@ qmljsobjecttree.cpp
include(../../libs/qmljsdebugclient/qmljsdebugclient-lib.pri)
-OTHER_FILES += QmlJSInspector.pluginspec
RESOURCES += qmljsinspector.qrc
include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
index d18c79999b0618a96d55b4b9153ff3624fbd1af4..349ca8193cdacdc1e78775be721c2934cef8ac2d 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
@@ -35,5 +35,4 @@ SOURCES += qmlproject.cpp \
RESOURCES += qmlproject.qrc
-OTHER_FILES += QmlProjectManager.pluginspec \
- QmlProject.mimetypes.xml
+OTHER_FILES += QmlProject.mimetypes.xml
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index e456017ebe5b93beb7d2a4b63204ae20a2470a42..78fa9e4a0bbc35f2a5c627d2cff5219b442915c6 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -142,4 +142,4 @@ include(qt-s60/qt-s60.pri)
include(qt-maemo/qt-maemo.pri)
include(customwidgetwizard/customwidgetwizard.pri)
DEFINES += QT_NO_CAST_TO_ASCII
-OTHER_FILES += Qt4ProjectManager.pluginspec Qt4ProjectManager.mimetypes.xml
+OTHER_FILES += Qt4ProjectManager.mimetypes.xml
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index 8d55df33f25fb3d0ed503a09c1284fff52773975..c300b4c5b696fa0dab163ee394ca8f69f2ac52ff 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/src/plugins/resourceeditor/resourceeditor.pro
@@ -22,5 +22,3 @@ resourcewizard.cpp \
resourceeditorw.cpp
RESOURCES += resourceeditor.qrc
-
-OTHER_FILES += ResourceEditor.pluginspec
diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro
index 3879d42568ccc5fe51c4c633fbb4f59c99267684..6a46a3679a8725a7adccf5fa6bd9247cd99c6c55 100644
--- a/src/plugins/subversion/subversion.pro
+++ b/src/plugins/subversion/subversion.pro
@@ -31,5 +31,3 @@ SOURCES += annotationhighlighter.cpp \
FORMS += settingspage.ui
RESOURCES += subversion.qrc
-
-OTHER_FILES += Subversion.pluginspec
diff --git a/src/plugins/tasklist/tasklist.pro b/src/plugins/tasklist/tasklist.pro
index 388800a0003c44570c994cfece95ebb7eb6823bb..9c35d6aea9c11982725e22ab7a3e0cf72866bc50 100644
--- a/src/plugins/tasklist/tasklist.pro
+++ b/src/plugins/tasklist/tasklist.pro
@@ -19,5 +19,4 @@ SOURCES += tasklistplugin.cpp \
RESOURCES += tasklist.qrc
-OTHER_FILES += TaskList.pluginspec \
- TaskList.mimetypes.xml
+OTHER_FILES += TaskList.mimetypes.xml
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index 21a4ba99528121840e5d49cd24b7d6080304fd56..3b84f9c979ca9befc1651372f2064d20426b6768 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -153,4 +153,4 @@ FORMS += behaviorsettingspage.ui \
generichighlighter/highlightersettingspage.ui \
generichighlighter/managedefinitionsdialog.ui
RESOURCES += texteditor.qrc
-OTHER_FILES += TextEditor.pluginspec TextEditor.mimetypes.xml
+OTHER_FILES += TextEditor.mimetypes.xml
diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro
index acf42be106cd7848bbe3e8fc1e20c2999a0cf439..066deab63d83a1315914f5c3569f344266dfd713 100644
--- a/src/plugins/vcsbase/vcsbase.pro
+++ b/src/plugins/vcsbase/vcsbase.pro
@@ -60,5 +60,3 @@ FORMS += commonsettingspage.ui \
checkoutprogresswizardpage.ui \
basecheckoutwizardpage.ui \
cleandialog.ui
-
-OTHER_FILES += VCSBase.pluginspec
diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro
index f5ad9bbe9f365f3770b689db185be54e1d1afe84..9fcb3be5f9887acb1ce8ab34646d7f8e6b52aa85 100644
--- a/src/plugins/welcome/welcome.pro
+++ b/src/plugins/welcome/welcome.pro
@@ -17,4 +17,3 @@ FORMS += welcomemode.ui \
communitywelcomepagewidget.ui
RESOURCES += welcome.qrc
DEFINES += WELCOME_LIBRARY
-OTHER_FILES += Welcome.pluginspec
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index f27097c03721a030f9aaf071b875cce162c6e43c..fc7b40ef07676e439fded1c932c09e3cab710483 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -26,6 +26,7 @@ copy2build.name = COPY ${QMAKE_FILE_IN}
copy2build.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy2build
+OTHER_FILES += $$PLUGINSPECS
macx {
!isEmpty(TIGER_COMPAT_MODE) {