diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index d9f32faec925..2cf7758c1d5b 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -76,6 +76,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "java-impl",
     "java-psi-impl",
     "java-structure-view",
+    "json",
     "jsp-spi",
     "manifest",
     "platform-main",
diff --git a/json/src/com/intellij/json/JsonFileType.java b/json/src/com/intellij/json/JsonFileType.java
index 3a2d0a448ad7..c57408538077 100644
--- a/json/src/com/intellij/json/JsonFileType.java
+++ b/json/src/com/intellij/json/JsonFileType.java
@@ -27,7 +27,7 @@ public class JsonFileType extends LanguageFileType{
   @NotNull
   @Override
   public String getDescription() {
-    return "JSON language";
+    return "JSON files";
   }
 
   @NotNull
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml
index ef26ab80462f..dccd77074d0f 100644
--- a/python/src/META-INF/pycharm-core.xml
+++ b/python/src/META-INF/pycharm-core.xml
@@ -12,6 +12,7 @@
   <xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)">
     <xi:fallback/>
   </xi:include>
+  <xi:include href="/META-INF/JsonPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <application-components>
     <component>