diff --git a/.idea/modules.xml b/.idea/modules.xml
index 44693dcf252d..e9f02784d19c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -277,6 +277,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" filepath="$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/yaml/yaml.iml" filepath="$PROJECT_DIR$/plugins/yaml/yaml.iml" group="plugins" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 22b39bcc16de..06f698053971 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -658,6 +658,17 @@ public def layoutCommunityPlugins(String home, boolean maySkipAndroidPlugin = fa
     layoutPlugin("settings-repository") {
       fileset(dir: "$home/plugins/settings-repository/lib", excludes: "**/*-sources.jar,**/*.xml,**/com/**,**/org/**,**/java/**,**/dev/**")
     }
+
+    pluginDir("yaml") {
+      dir("lib") {
+        jar("yaml.jar") {
+          noResources("yaml")
+          module("yaml")
+        }
+        resources("yaml")
+      }
+    }
+
   }
 }
 
diff --git a/community-main.iml b/community-main.iml
index 1e6255f204a4..ea35d365deee 100644
--- a/community-main.iml
+++ b/community-main.iml
@@ -92,6 +92,7 @@
     <orderEntry type="module" module-name="javaFX-jps-plugin" />
     <orderEntry type="module" module-name="IntelliLang-tests" />
     <orderEntry type="module" module-name="manifest" />
+    <orderEntry type="module" module-name="yaml" />
     <orderEntry type="module" module-name="xml-tests" scope="TEST" />
     <orderEntry type="module" module-name="devkit-jps-plugin" scope="TEST" />
     <orderEntry type="module" module-name="jps-model-tests" scope="TEST" />