diff --git a/images/src/META-INF/ImagesPlugin.xml b/images/src/META-INF/ImagesPlugin.xml
index 05e559eb7488..5a364be95779 100644
--- a/images/src/META-INF/ImagesPlugin.xml
+++ b/images/src/META-INF/ImagesPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <vendor>JetBrains</vendor>
 
diff --git a/java/java-tests/testData/ide/plugins/pluginDescriptor/spaces spaces/META-INF/plugin.xml b/java/java-tests/testData/ide/plugins/pluginDescriptor/spaces spaces/META-INF/plugin.xml
index fd9626d32976..f6e75a781905 100644
--- a/java/java-tests/testData/ide/plugins/pluginDescriptor/spaces spaces/META-INF/plugin.xml	
+++ b/java/java-tests/testData/ide/plugins/pluginDescriptor/spaces spaces/META-INF/plugin.xml	
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
     <name>URLs Test</name>
     <id>com.jetbrains.plugins.urls</id>
     <idea-version since-build="10000"/>
diff --git a/platform/platform-resources/src/META-INF/JsonPlugin.xml b/platform/platform-resources/src/META-INF/JsonPlugin.xml
index 856fcfcc1694..d818b431c304 100644
--- a/platform/platform-resources/src/META-INF/JsonPlugin.xml
+++ b/platform/platform-resources/src/META-INF/JsonPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <module value="com.intellij.modules.json"/>
 
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index 5b36b9cc07f2..3a980ff3b4c8 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 
diff --git a/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
index 3156132f904a..46837919f201 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <xi:include href="/META-INF/PlatformLangPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/platform/platform-resources/src/META-INF/PlatformPlugin.xml b/platform/platform-resources/src/META-INF/PlatformPlugin.xml
index fd5b7a1f99d7..4f31470fd65a 100644
--- a/platform/platform-resources/src/META-INF/PlatformPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 
diff --git a/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin1.xml b/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin1.xml
index 130494498349..b8be8385f650 100644
--- a/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin1.xml
+++ b/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
   <id>testPluginId</id>
   <name>testPluginId</name>
   <description>
diff --git a/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin2.xml b/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin2.xml
index e730cc2df9e4..dbfd3b9d868a 100644
--- a/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin2.xml
+++ b/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
   <id>testPluginId</id>
   <name>testPluginId</name>
   <description>
diff --git a/plugins/ByteCodeViewer/src/META-INF/plugin.xml b/plugins/ByteCodeViewer/src/META-INF/plugin.xml
index e1799b7b8323..1c005ad35875 100644
--- a/plugins/ByteCodeViewer/src/META-INF/plugin.xml
+++ b/plugins/ByteCodeViewer/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Bytecode Viewer</name>
   <id>ByteCodeViewer</id>
   <version>0.1</version>
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
index 6cf25dbe39b4..b2b2f1fe19b7 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="com.intellij">
 
diff --git a/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml b/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml
index 658b9983d6ee..9815fd4a99f5 100644
--- a/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml
+++ b/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="com.intellij">
     <localInspection shortName="UnknownLanguage" displayName="Unknown Language ID" groupName="Language Injection" enabledByDefault="true"
diff --git a/plugins/IntelliLang/src/META-INF/intellilang-xml-support.xml b/plugins/IntelliLang/src/META-INF/intellilang-xml-support.xml
index 9392fba45f34..e6dd7f3337cd 100644
--- a/plugins/IntelliLang/src/META-INF/intellilang-xml-support.xml
+++ b/plugins/IntelliLang/src/META-INF/intellilang-xml-support.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="com.intellij">
     <multiHostInjector implementation="org.intellij.plugins.intelliLang.inject.xml.XmlLanguageInjector"/>
diff --git a/plugins/IntelliLang/src/META-INF/intellilang-xpath-support.xml b/plugins/IntelliLang/src/META-INF/intellilang-xpath-support.xml
index 093f8148302e..5dda5f5102ba 100644
--- a/plugins/IntelliLang/src/META-INF/intellilang-xpath-support.xml
+++ b/plugins/IntelliLang/src/META-INF/intellilang-xpath-support.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="org.intellij.plugins.intelliLang.inject.config.XPathSupportProxy"
                         serviceImplementation="org.intellij.plugins.intelliLang.inject.config.XPathSupportProxyImpl"/>
diff --git a/plugins/IntelliLang/src/META-INF/plugin.xml b/plugins/IntelliLang/src/META-INF/plugin.xml
index a9789064a1f2..1cdc38748ce5 100644
--- a/plugins/IntelliLang/src/META-INF/plugin.xml
+++ b/plugins/IntelliLang/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>IntelliLang</name>
   <id>org.intellij.intelliLang</id>
   <vendor>JetBrains</vendor>
diff --git a/plugins/IntentionPowerPak/src/META-INF/IntentionPowerPack.xml b/plugins/IntentionPowerPak/src/META-INF/IntentionPowerPack.xml
index 0e7d73362ffd..6b2d94cf39e3 100644
--- a/plugins/IntentionPowerPak/src/META-INF/IntentionPowerPack.xml
+++ b/plugins/IntentionPowerPak/src/META-INF/IntentionPowerPack.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="com.intellij">
 
diff --git a/plugins/ShortcutPromoter/resources/META-INF/plugin.xml b/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
index 0ea57fcaabed..4ea4e3771c41 100644
--- a/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
+++ b/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Shortcut Promoter</name>
   <id>com.intellij.promoter</id>
   <version>1.0</version>
diff --git a/plugins/ant/src/META-INF/plugin.xml b/plugins/ant/src/META-INF/plugin.xml
index def130955ae0..9ad1648a6269 100644
--- a/plugins/ant/src/META-INF/plugin.xml
+++ b/plugins/ant/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Ant Support</name>
   <id>AntSupport</id>
   <version>1.0</version>
diff --git a/plugins/copyright/src/META-INF/plugin.xml b/plugins/copyright/src/META-INF/plugin.xml
index 0a583be018b5..02c994b86385 100644
--- a/plugins/copyright/src/META-INF/plugin.xml
+++ b/plugins/copyright/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Copyright</name>
   <id>com.intellij.copyright</id>
   <description>
diff --git a/plugins/coverage-common/src/META-INF/coverage-common-plugin.xml b/plugins/coverage-common/src/META-INF/coverage-common-plugin.xml
index 028b043cf6d0..1bf507b68be2 100644
--- a/plugins/coverage-common/src/META-INF/coverage-common-plugin.xml
+++ b/plugins/coverage-common/src/META-INF/coverage-common-plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.coverageRunner" interface="com.intellij.coverage.CoverageRunner"/>
     <extensionPoint qualifiedName="com.intellij.coverageEngine" interface="com.intellij.coverage.CoverageEngine"/>
diff --git a/plugins/coverage/src/META-INF/plugin.xml b/plugins/coverage/src/META-INF/plugin.xml
index d366b0275441..6b9f5961d53e 100644
--- a/plugins/coverage/src/META-INF/plugin.xml
+++ b/plugins/coverage/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Coverage</name>
   <depends optional="true" config-file="testng-integration.xml">TestNG-J</depends>
   <depends optional="true" config-file="junit-integration.xml">JUnit</depends>
diff --git a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
index e6d2cfc6902a..7b3f36c476e7 100644
--- a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
+++ b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>CVS Integration</name>
   <id>CVS</id>
   <version>11</version>
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index 36933ac68e19..9a560466a817 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Plugin DevKit</name>
   <id>DevKit</id>
   <version>1.0</version>
diff --git a/plugins/devkit/testData/build/simple/META-INF/plugin.xml b/plugins/devkit/testData/build/simple/META-INF/plugin.xml
index e5b561ad0423..85a919a930a6 100644
--- a/plugins/devkit/testData/build/simple/META-INF/plugin.xml
+++ b/plugins/devkit/testData/build/simple/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>test.plugin</id>
   <name>Test Plugin</name>
   <version>1.0</version>
diff --git a/plugins/devkit/testData/build/withJpsModule/META-INF/plugin.xml b/plugins/devkit/testData/build/withJpsModule/META-INF/plugin.xml
index 0def625fa1c2..598ff4ec7466 100644
--- a/plugins/devkit/testData/build/withJpsModule/META-INF/plugin.xml
+++ b/plugins/devkit/testData/build/withJpsModule/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>test.plugin</id>
   <name>Test Plugin</name>
   <version>1.0</version>
diff --git a/plugins/devkit/testData/codeInsight/createRequiredAttribute.xml b/plugins/devkit/testData/codeInsight/createRequiredAttribute.xml
index 3de5442209ef..97ee8d3968c8 100644
--- a/plugins/devkit/testData/codeInsight/createRequiredAttribute.xml
+++ b/plugins/devkit/testData/codeInsight/createRequiredAttribute.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 
diff --git a/plugins/devkit/testData/codeInsight/createRequiredAttribute_after.xml b/plugins/devkit/testData/codeInsight/createRequiredAttribute_after.xml
index cbdf9c454c7b..602a28315e09 100644
--- a/plugins/devkit/testData/codeInsight/createRequiredAttribute_after.xml
+++ b/plugins/devkit/testData/codeInsight/createRequiredAttribute_after.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 
diff --git a/plugins/devkit/testData/codeInsight/extensionPointPresentation.xml b/plugins/devkit/testData/codeInsight/extensionPointPresentation.xml
index 482186899455..951bf3a85b91 100644
--- a/plugins/devkit/testData/codeInsight/extensionPointPresentation.xml
+++ b/plugins/devkit/testData/codeInsight/extensionPointPresentation.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
     <id>foo</id>
 
diff --git a/plugins/devkit/testData/inspections/inspectionDescription/resources/META-INF/plugin.xml b/plugins/devkit/testData/inspections/inspectionDescription/resources/META-INF/plugin.xml
index 9325b3115c34..c1d1e9cca203 100644
--- a/plugins/devkit/testData/inspections/inspectionDescription/resources/META-INF/plugin.xml
+++ b/plugins/devkit/testData/inspections/inspectionDescription/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij.example</id>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMapping.xml b/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMapping.xml
index cb7aba24ab39..7efd17bf0647 100644
--- a/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMapping.xml
+++ b/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMapping.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <id>com.intellij</id>
 
diff --git a/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMappingWithDefaultBundle.xml b/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMappingWithDefaultBundle.xml
index 0f614a1cec0c..5059c9e74544 100644
--- a/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMappingWithDefaultBundle.xml
+++ b/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMappingWithDefaultBundle.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <id>com.intellij</id>
   <resource-bundle>bundle</resource-bundle>
diff --git a/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude-main.xml b/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude-main.xml
index 280b9b93c555..571c18b32c28 100644
--- a/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude-main.xml
+++ b/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude-main.xml
@@ -1,4 +1,4 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" version="2">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
 
     <id>com.intellij</id>
 
diff --git a/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude.xml b/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude.xml
index 849086d4989f..593dd40f18d4 100644
--- a/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude.xml
+++ b/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
     <id>foo</id>
 
diff --git a/plugins/devkit/testData/references/extensions/extensionPointDocumentation.xml b/plugins/devkit/testData/references/extensions/extensionPointDocumentation.xml
index 482186899455..951bf3a85b91 100644
--- a/plugins/devkit/testData/references/extensions/extensionPointDocumentation.xml
+++ b/plugins/devkit/testData/references/extensions/extensionPointDocumentation.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
     <id>foo</id>
 
diff --git a/plugins/editorconfig/src/META-INF/plugin.xml b/plugins/editorconfig/src/META-INF/plugin.xml
index 8d8ff18f3139..b194bdbcdd8a 100644
--- a/plugins/editorconfig/src/META-INF/plugin.xml
+++ b/plugins/editorconfig/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>org.editorconfig.editorconfigjetbrains</id>
   <name>EditorConfig</name>
   <vendor url="http://editorconfig.org">Kevin Bell, JetBrains</vendor>
diff --git a/plugins/github/src/META-INF/github-tracker.xml b/plugins/github/src/META-INF/github-tracker.xml
index 0e9c8dd3d6cc..8e0c06190aa8 100644
--- a/plugins/github/src/META-INF/github-tracker.xml
+++ b/plugins/github/src/META-INF/github-tracker.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <tasks.repositoryType implementation="org.jetbrains.plugins.github.tasks.GithubRepositoryType"/>
   </extensions>
diff --git a/plugins/github/src/META-INF/plugin.xml b/plugins/github/src/META-INF/plugin.xml
index acafb311cc1a..64f5ccebd3f3 100644
--- a/plugins/github/src/META-INF/plugin.xml
+++ b/plugins/github/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>GitHub</name>
   <id>org.jetbrains.plugins.github</id>
   <vendor>JetBrains</vendor>
diff --git a/plugins/gradle/src/META-INF/gradle-maven-integration.xml b/plugins/gradle/src/META-INF/gradle-maven-integration.xml
index b8fad2f5c3be..2cd12be2fd38 100644
--- a/plugins/gradle/src/META-INF/gradle-maven-integration.xml
+++ b/plugins/gradle/src/META-INF/gradle-maven-integration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<idea-plugin version="2">
+<idea-plugin>
 
   <project-components>
     <component>
diff --git a/plugins/groovy/src/META-INF/intellilang-groovy-support.xml b/plugins/groovy/src/META-INF/intellilang-groovy-support.xml
index e5eeb6090acb..cd2108a8c0f3 100644
--- a/plugins/groovy/src/META-INF/intellilang-groovy-support.xml
+++ b/plugins/groovy/src/META-INF/intellilang-groovy-support.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="org.intellij.intelliLang">
     <languageSupport implementation="org.intellij.plugins.intelliLang.inject.groovy.GroovyLanguageInjectionSupport"/>
diff --git a/plugins/java-decompiler/plugin/src/META-INF/plugin.xml b/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
index c4657b4cd5fa..b64e370c615b 100644
--- a/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
+++ b/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <id>org.jetbrains.java.decompiler</id>
   <name>Java Bytecode Decompiler</name>
diff --git a/plugins/java-i18n/src/META-INF/plugin.xml b/plugins/java-i18n/src/META-INF/plugin.xml
index f5c57b0dd861..7e906375ff7a 100644
--- a/plugins/java-i18n/src/META-INF/plugin.xml
+++ b/plugins/java-i18n/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij.java-i18n</id>
   <name>I18n for Java</name>
   <depends>com.intellij.properties</depends>
diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml
index 2fc00e59a770..3a374559f16c 100644
--- a/plugins/properties/src/META-INF/plugin.xml
+++ b/plugins/properties/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij.properties</id>
   <name>Properties Support</name>
   <depends>com.intellij.modules.xml</depends>
diff --git a/plugins/settings-repository/resources/META-INF/plugin.xml b/plugins/settings-repository/resources/META-INF/plugin.xml
index 337c79b57bf2..d549e09ba0e6 100644
--- a/plugins/settings-repository/resources/META-INF/plugin.xml
+++ b/plugins/settings-repository/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Settings Repository</name>
   <id>org.jetbrains.settingsRepository</id>
   <description><![CDATA[
diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index ec8278d42098..ce552db3cd3d 100644
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Subversion Integration</name>
   <id>Subversion</id>
   <version>1.1</version>
diff --git a/plugins/tasks/tasks-core/src/META-INF/java-contexts.xml b/plugins/tasks/tasks-core/src/META-INF/java-contexts.xml
index 8d8623e39990..f6de89f2b8c0 100644
--- a/plugins/tasks/tasks-core/src/META-INF/java-contexts.xml
+++ b/plugins/tasks/tasks-core/src/META-INF/java-contexts.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij.tasks">
 
     <contextProvider implementation="com.intellij.tasks.context.java.BreakpointsContextProvider"/>
diff --git a/plugins/tasks/tasks-core/src/META-INF/plugin.xml b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
index 68d4adcfbb0a..544e19c5d656 100644
--- a/plugins/tasks/tasks-core/src/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij.tasks</id>
   <name>Task Management</name>
   <description>Enables task and context management</description>
diff --git a/plugins/terminal/resources/META-INF/plugin.xml b/plugins/terminal/resources/META-INF/plugin.xml
index 906e9270c9ea..24150834ebbf 100644
--- a/plugins/terminal/resources/META-INF/plugin.xml
+++ b/plugins/terminal/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2"  xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Terminal</name>
   <id>org.jetbrains.plugins.terminal</id>
   <version>0.1</version>
diff --git a/plugins/terminal/resources/META-INF/terminal.xml b/plugins/terminal/resources/META-INF/terminal.xml
index 165952ce6e92..1e8fa4bb6773 100644
--- a/plugins/terminal/resources/META-INF/terminal.xml
+++ b/plugins/terminal/resources/META-INF/terminal.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <depends optional="true" config-file="terminal-for-remote-servers.xml">com.intellij.modules.remoteServers</depends>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml b/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
index 499619eea8eb..f4800c37d94a 100644
--- a/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
+++ b/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <module value="com.intellij.ui-designer-new"/>
 
diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml
index 649a94223feb..fac25aa43de1 100644
--- a/plugins/ui-designer/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>UI Designer</name>
   <id>com.intellij.uiDesigner</id>
   <vendor>JetBrains</vendor>
diff --git a/plugins/xpath/xpath-view/src/META-INF/plugin.xml b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
index 03951216939f..41f4170bc60d 100644
--- a/plugins/xpath/xpath-view/src/META-INF/plugin.xml
+++ b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<idea-plugin version="2">
+<idea-plugin>
 
   <!-- Plugin name -->
   <id>XPathView</id>
diff --git a/plugins/xslt-debugger/src/META-INF/plugin.xml b/plugins/xslt-debugger/src/META-INF/plugin.xml
index 2affaff7fd5b..caf0d31950cb 100644
--- a/plugins/xslt-debugger/src/META-INF/plugin.xml
+++ b/plugins/xslt-debugger/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" url="https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger">
+<idea-plugin url="https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger">
   <name>XSLT-Debugger</name>
   <id>XSLT-Debugger</id>
 
diff --git a/plugins/yaml/resources/META-INF/plugin.xml b/plugins/yaml/resources/META-INF/plugin.xml
index 9288a63d97a6..12b2fa58e7c5 100644
--- a/plugins/yaml/resources/META-INF/plugin.xml
+++ b/plugins/yaml/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>YAML</name>
   <id>org.jetbrains.plugins.yaml</id>
   <vendor>JetBrains</vendor>
diff --git a/python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml b/python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml
index c96f0b7f2b3a..f3f24406ab3b 100644
--- a/python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml
+++ b/python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="org.intellij.intelliLang">
     <languageSupport implementation="com.jetbrains.python.intelliLang.PyLanguageInjectionSupport"/>
     <injectionConfig config="resources/pyInjections.xml"/>
diff --git a/python/IntelliLang-python/resources/META-INF/plugin.xml b/python/IntelliLang-python/resources/META-INF/plugin.xml
index 902e05447b7b..40b746dd27e0 100644
--- a/python/IntelliLang-python/resources/META-INF/plugin.xml
+++ b/python/IntelliLang-python/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Python IntelliLang</name>
   <id>org.jetbrains.plugins.python-intelliLang</id>
   <version>VERSION</version>
diff --git a/python/educational-core/course-creator/resources/META-INF/plugin.xml b/python/educational-core/course-creator/resources/META-INF/plugin.xml
index b4072b3de1bf..253ecc51e376 100644
--- a/python/educational-core/course-creator/resources/META-INF/plugin.xml
+++ b/python/educational-core/course-creator/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.jetbrains.edu.coursecreator</id>
   <name>Course Creator Plugin</name>
   <version>2.0.3</version>
diff --git a/python/educational-core/student/resources/META-INF/plugin.xml b/python/educational-core/student/resources/META-INF/plugin.xml
index c0ad88e0a788..6f842f044c9f 100644
--- a/python/educational-core/student/resources/META-INF/plugin.xml
+++ b/python/educational-core/student/resources/META-INF/plugin.xml
@@ -1,5 +1,5 @@
 <!--suppress XmlUnboundNsPrefix -->
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.jetbrains.edu.interactivelearning</id>
   <name>Educational plugin core</name>
   <version>2.0.4</version>
diff --git a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml b/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
index 935305d81f4e..85ec939dd37e 100644
--- a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.jetbrains.edu.coursecreator.python</id>
   <name>Course Creator for PyCharm Edu</name>
   <version>2.0.3</version>
diff --git a/python/educational-python/src/META-INF/IdeTipsAndTricks.xml b/python/educational-python/src/META-INF/IdeTipsAndTricks.xml
index fdef342ecb9d..45d7c8f4fdf5 100644
--- a/python/educational-python/src/META-INF/IdeTipsAndTricks.xml
+++ b/python/educational-python/src/META-INF/IdeTipsAndTricks.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
         <tipAndTrick file="Welcome.html"/>
         <tipAndTrick file="MultipleProjects.html"/>
diff --git a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
index 1ab0655a25ea..7283b7cecd28 100644
--- a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work ONLY in Pycharm Educational Edition -->
 
   <application-components>
diff --git a/python/educational-python/student-python/resources/META-INF/plugin.xml b/python/educational-python/student-python/resources/META-INF/plugin.xml
index f42556f44a19..73c614773484 100644
--- a/python/educational-python/student-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/student-python/resources/META-INF/plugin.xml
@@ -1,5 +1,5 @@
 <!--suppress XmlUnboundNsPrefix -->
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.jetbrains.python.edu.interactivelearning.python</id>
   <name>Educational plugin for PyCharm</name>
   <version>2.0.4</version>
diff --git a/python/ide/src/META-INF/PyCharmCorePlugin.xml b/python/ide/src/META-INF/PyCharmCorePlugin.xml
index e8a88bce634e..3e1f95d0b15b 100644
--- a/python/ide/src/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide/src/META-INF/PyCharmCorePlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/python-core-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml
index f711f7df3a18..6c026f880445 100644
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -1,4 +1,4 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" version="2">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
        Both Community and Professional editions. -->
 
diff --git a/python/ipnb/resources/META-INF/ipython-notebook.xml b/python/ipnb/resources/META-INF/ipython-notebook.xml
index 1dbc44eb4753..e895c65688d7 100644
--- a/python/ipnb/resources/META-INF/ipython-notebook.xml
+++ b/python/ipnb/resources/META-INF/ipython-notebook.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <project-components>
     <component>
       <implementation-class>org.jetbrains.plugins.ipnb.configuration.IpnbConnectionManager</implementation-class>
diff --git a/python/ipnb/resources/META-INF/plugin.xml b/python/ipnb/resources/META-INF/plugin.xml
index bb9560c95743..58edb28db8b2 100644
--- a/python/ipnb/resources/META-INF/plugin.xml
+++ b/python/ipnb/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>IPython Notebook</name>
   <id>org.jetbrains.plugins.ipnb</id>
   <version>0.1</version>
diff --git a/python/pluginCore/META-INF/python-community-plugin-core.xml b/python/pluginCore/META-INF/python-community-plugin-core.xml
index 773c0f08e9ca..722cace68897 100644
--- a/python/pluginCore/META-INF/python-community-plugin-core.xml
+++ b/python/pluginCore/META-INF/python-community-plugin-core.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <!-- Components and extensions declared in this file work ONLY in the Python plugin,
        both Community and Professional versions. -->
 
diff --git a/python/pluginJava/META-INF/python-community-plugin-java.xml b/python/pluginJava/META-INF/python-community-plugin-java.xml
index de5ddc95d72a..90f3df261b84 100644
--- a/python/pluginJava/META-INF/python-community-plugin-java.xml
+++ b/python/pluginJava/META-INF/python-community-plugin-java.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <!-- Components and extensions declared in this file work ONLY in the Python plugin,
        both Community and Professional versions. -->
   <extensions defaultExtensionNs="com.intellij">
diff --git a/python/pluginResources/META-INF/plugin.xml b/python/pluginResources/META-INF/plugin.xml
index 983b2d14798f..41e58fe864ed 100644
--- a/python/pluginResources/META-INF/plugin.xml
+++ b/python/pluginResources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
   <!-- Components and extensions declared in this file work ONLY in Python plugin, not in standalone PyCharm.
        Anything related to Python/Java integration must go in this file. -->
 
diff --git a/python/python-community-configure/resources/META-INF/python-community-configure-common.xml b/python/python-community-configure/resources/META-INF/python-community-configure-common.xml
index 4c5ca9ea7ac0..e14a21990a0e 100644
--- a/python/python-community-configure/resources/META-INF/python-community-configure-common.xml
+++ b/python/python-community-configure/resources/META-INF/python-community-configure-common.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" url="https://confluence.jetbrains.com/display/PYH/">
+<idea-plugin url="https://confluence.jetbrains.com/display/PYH/">
   <!-- Components and extensions declared in this file work ONLY in PyCharm and CLion Python plugin, not in Standard Python plugin.
        Both Community and Professional editions. -->
 
diff --git a/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml b/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
index ed54098266fd..975d12d49ce3 100644
--- a/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
+++ b/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
        Both Community and Professional editions. -->
 
diff --git a/python/python-community-ide-resources/resources/META-INF/IdeTipsAndTricks.xml b/python/python-community-ide-resources/resources/META-INF/IdeTipsAndTricks.xml
index 06b2dadd1557..5d95fdb9c0fc 100644
--- a/python/python-community-ide-resources/resources/META-INF/IdeTipsAndTricks.xml
+++ b/python/python-community-ide-resources/resources/META-INF/IdeTipsAndTricks.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <tipAndTrick file="Welcome.html"/>
     <tipAndTrick file="MultipleProjects.html"/>
diff --git a/python/python-rest/resources/META-INF/plugin.xml b/python/python-rest/resources/META-INF/plugin.xml
index 12679768df35..547df9d77af8 100644
--- a/python/python-rest/resources/META-INF/plugin.xml
+++ b/python/python-rest/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Python ReStructureText Integration</name>
   <id>org.jetbrains.plugins.python-rest</id>
   <version>1.0</version>
diff --git a/python/python-rest/resources/META-INF/python-rest-plugin.xml b/python/python-rest/resources/META-INF/python-rest-plugin.xml
index 59a28682435f..9bd933de2a0d 100644
--- a/python/python-rest/resources/META-INF/python-rest-plugin.xml
+++ b/python/python-rest/resources/META-INF/python-rest-plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
 
     <lang.fileViewProviderFactory language="ReST"
diff --git a/python/python-terminal/resources/META-INF/plugin.xml b/python/python-terminal/resources/META-INF/plugin.xml
index 742ab2cd25cc..40959c35a954 100644
--- a/python/python-terminal/resources/META-INF/plugin.xml
+++ b/python/python-terminal/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Python Terminal</name>
   <id>org.jetbrains.plugins.python-terminal</id>
   <version>VERSION</version>
diff --git a/python/python-terminal/resources/META-INF/python-terminal-plugin.xml b/python/python-terminal/resources/META-INF/python-terminal-plugin.xml
index fb3dbafc50c0..bd4bbdf70128 100644
--- a/python/python-terminal/resources/META-INF/python-terminal-plugin.xml
+++ b/python/python-terminal/resources/META-INF/python-terminal-plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="org.jetbrains.plugins.terminal">
     <localTerminalCustomizer implementation="com.jetbrains.python.sdk.PyVirtualEnvTerminalCustomizer"/>
   </extensions>
diff --git a/python/rest/resources/META-INF/plugin.xml b/python/rest/resources/META-INF/plugin.xml
index 201c25ce1d06..ddf769ed974d 100644
--- a/python/rest/resources/META-INF/plugin.xml
+++ b/python/rest/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>ReStructuredText Support</name>
   <id>org.jetbrains.plugins.rest</id>
   <description>This plugin enables support for reStructuredText files (*.rst)</description>
diff --git a/python/rest/resources/META-INF/rest.xml b/python/rest/resources/META-INF/rest.xml
index 70c4a3478bfb..eaa2d1c54a64 100644
--- a/python/rest/resources/META-INF/rest.xml
+++ b/python/rest/resources/META-INF/rest.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
 
     <fileTypeFactory implementation="com.jetbrains.rest.RestFileTypeFactory"/>
diff --git a/python/src/META-INF/command-line.xml b/python/src/META-INF/command-line.xml
index c1970825b5ff..470f0ac63612 100644
--- a/python/src/META-INF/command-line.xml
+++ b/python/src/META-INF/command-line.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <!--
    Extension points to support gnu command line language.
diff --git a/python/src/META-INF/python-core-buildout.xml b/python/src/META-INF/python-core-buildout.xml
index 77395466c21e..caae3219a2e7 100644
--- a/python/src/META-INF/python-core-buildout.xml
+++ b/python/src/META-INF/python-core-buildout.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <!-- Components and extensions declared in this file work both in PyCharm and Python plugin (but not in CLion).
        Both Community and Professional editions. -->
 
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 3e33168e5c74..3955e528e977 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work both in PyCharm and Python plugin.
        Both Community and Professional editions. -->
 
diff --git a/python/src/META-INF/python-core-ide.xml b/python/src/META-INF/python-core-ide.xml
index e8f0574a9658..873a4fa9cb3e 100644
--- a/python/src/META-INF/python-core-ide.xml
+++ b/python/src/META-INF/python-core-ide.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
        Both Community and Professional editions. -->
 
diff --git a/python/src/META-INF/python-core-plugin.xml b/python/src/META-INF/python-core-plugin.xml
index 012249406408..311b4296575f 100644
--- a/python/src/META-INF/python-core-plugin.xml
+++ b/python/src/META-INF/python-core-plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work both in PyCharm and Python plugin.
        Both Community and Professional editions. -->
 
diff --git a/resources/src/META-INF/IdeTipsAndTricks.xml b/resources/src/META-INF/IdeTipsAndTricks.xml
index 8678daa5f499..7b7a394c7dc7 100644
--- a/resources/src/META-INF/IdeTipsAndTricks.xml
+++ b/resources/src/META-INF/IdeTipsAndTricks.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <!--
     <tipAndTrick file="NotReadyYet.html"/>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 38510f8348c2..e542635e28d6 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -13,7 +13,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index ff41b7b47691..6dbb8498fa2c 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- former Flex IDE foundation, todo: integrate into IdeaPlugin.xml -->
 
   <module value="com.intellij.modules.platform"/>
diff --git a/samples/comparingReferences/source/META-INF/plugin.xml b/samples/comparingReferences/source/META-INF/plugin.xml
index 36bf3d61f834..38c3b4af80f9 100644
--- a/samples/comparingReferences/source/META-INF/plugin.xml
+++ b/samples/comparingReferences/source/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Comparing References Inspection</name>
   <description>Inspection for (probably) inappropriate use of equality relation operation.</description>
   <version>1.0</version>
diff --git a/samples/conditionalOperatorConvertor/META-INF/plugin.xml b/samples/conditionalOperatorConvertor/META-INF/plugin.xml
index 17c55b92a200..8e10f5ae5d43 100644
--- a/samples/conditionalOperatorConvertor/META-INF/plugin.xml
+++ b/samples/conditionalOperatorConvertor/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
     <name>Conditional Operator Converter</name>
     <id>ConditionalOperatorConverter</id>
     <description>Intention action that suggests to convert a conditional operator into
diff --git a/xml/tests/testData/xml/PluginXml.xml b/xml/tests/testData/xml/PluginXml.xml
index 62a7c4dcefec..f5864045d6d3 100644
--- a/xml/tests/testData/xml/PluginXml.xml
+++ b/xml/tests/testData/xml/PluginXml.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE idea-plugin PUBLIC "Plugin/DTD" "http://plugins.intellij.net/plugin.dtd">
-<idea-plugin version="2">
+<idea-plugin>
     <name>Inspection Gadgets</name>
     <id>InspectionGadgets</id>
     <vendor>InspectionGadgets Software</vendor>