diff --git a/python/pluginSrc/META-INF/plugin.xml b/python/pluginSrc/META-INF/plugin.xml
index 7366ff41d498..02d21157a838 100644
--- a/python/pluginSrc/META-INF/plugin.xml
+++ b/python/pluginSrc/META-INF/plugin.xml
@@ -22,6 +22,7 @@
     <facetType implementation="com.jetbrains.python.facet.PythonFacetType"/>
     <frameworkSupport implementation="com.jetbrains.python.facet.PythonFrameworkSupportProvider"/>
     <frameworkSupport implementation="com.jetbrains.django.facet.DjangoFacetSupportProvider"/>
+    <frameworkSupport implementation="com.jetbrains.appengine.facet.AppEngineFacetSupportProvider"/>
     <moduleConfigurationEditorProvider implementation="com.jetbrains.python.module.PythonModuleConfigurationEditorProvider"/>
   </extensions>
 
diff --git a/python/python.iml b/python/python.iml
index 12d1cee10d4f..2eed16a30183 100644
--- a/python/python.iml
+++ b/python/python.iml
@@ -35,6 +35,8 @@
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="xdebugger-api" />
     <orderEntry type="module" module-name="RegExpSupport" />
+    <orderEntry type="module" module-name="yaml" />
+    <orderEntry type="library" name="microba" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 8524c8817e5c..c0d3d8b20063 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -141,6 +141,24 @@
 
     <liveTemplateContext implementation="com.jetbrains.django.lang.template.DjangoTemplateContextType"/>
     <liveTemplateMacro implementation="com.jetbrains.django.lang.template.DjangoVariableMacro"/>
+
+    <!-- App Engine -->
+    <facetType implementation="com.jetbrains.appengine.facet.AppEngineFacetType"/>
+
+    <configurationType implementation="com.jetbrains.appengine.run.AppEngineServerRunConfigurationType"/>
+
+    <lang.parserDefinition language="GQL" implementationClass="com.jetbrains.appengine.lang.gql.parsing.GqlParserDefinition" />
+    <multiHostInjector implementation="com.jetbrains.appengine.lang.gql.GqlLanguageInjector"/>
+    <lang.syntaxHighlighterFactory key="GQL"
+                                     implementationClass="com.jetbrains.appengine.lang.gql.highlighting.GqlHighlighterFactory"/>
+
+    <completion.contributor language="Python" implementationClass="com.jetbrains.appengine.model.ModelAttributeCompletionContributor"/>
+    <completion.contributor language="yaml" implementationClass="com.jetbrains.appengine.completion.AppYamlKeyCompletionContributor"/>
+    <completion.contributor language="GQL" implementationClass="com.jetbrains.appengine.completion.GqlKeywordCompletionContributor"/>
+
+    <psi.referenceContributor implementation="com.jetbrains.appengine.ref.AppEngineReferenceContributor"/>
+
+    <inspectionToolProvider implementation="com.jetbrains.appengine.inspection.AppEngineInspectionToolProvider"/>
   </extensions>
 
   <extensionPoints>
@@ -221,5 +239,19 @@
 
       <add-to-group group-id="ToolsMenu" anchor="first"/>
     </action>
+
+    <group text="Google App Engine" popup="true">
+      <action id="PythonAppEngine.UploadAppAction" class="com.jetbrains.appengine.action.UpdateAppAction"
+              text="Upload App Engine app..."
+              description="Uploads App Engine application to google server">
+
+      </action>
+
+      <action id="PythonAppEngine.GetLogsAction" class="com.jetbrains.appengine.action.GetLogsAction"
+              text="Get App Engine logs..."
+              description="Downloads App Engine logs">
+      </action>
+      <add-to-group group-id="ToolsMenu" anchor="after" relative-to-action="Django.RunManageTaskAction"/>
+    </group>
   </actions>
 </idea-plugin>