diff --git a/java/java-analysis-api/src/com/intellij/uast/UastMetaLanguage.java b/java/java-analysis-api/src/com/intellij/uast/UastMetaLanguage.java
index 62c827b47584..5521dbb25251 100644
--- a/java/java-analysis-api/src/com/intellij/uast/UastMetaLanguage.java
+++ b/java/java-analysis-api/src/com/intellij/uast/UastMetaLanguage.java
@@ -3,6 +3,7 @@ package com.intellij.uast;
 
 import com.intellij.lang.Language;
 import com.intellij.lang.MetaLanguage;
+import com.intellij.openapi.extensions.ExtensionPointChangeListener;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.uast.UastLanguagePlugin;
@@ -22,7 +23,22 @@ public class UastMetaLanguage extends MetaLanguage {
 
     Collection<UastLanguagePlugin> languagePlugins = UastLanguagePlugin.Companion.getInstances();
     myLanguages = new THashSet<>(languagePlugins.size());
-    for (UastLanguagePlugin plugin: languagePlugins) {
+    initLanguages(languagePlugins);
+
+    UastLanguagePlugin.Companion
+      .getExtensionPointName()
+      .getPoint(null)
+      .addExtensionPointListener(new ExtensionPointChangeListener() {
+        @Override
+        public void extensionListChanged() {
+          myLanguages.clear();
+          initLanguages(UastLanguagePlugin.Companion.getInstances());
+        }
+      }, false, null);
+  }
+
+  private void initLanguages(Collection<UastLanguagePlugin> languagePlugins) {
+    for (UastLanguagePlugin plugin : languagePlugins) {
       myLanguages.add(plugin.getLanguage());
     }
   }
diff --git a/java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml b/java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml
index 9e1f389310e4..20bae5cc469f 100644
--- a/java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml
+++ b/java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml
@@ -48,7 +48,7 @@
       <with attribute="implementationClass" implements="com.intellij.psi.PsiAnnotationSupport"/>
     </extensionPoint>
     <extensionPoint qualifiedName="com.intellij.testFramework" interface="com.intellij.testIntegration.TestFramework" dynamic="true"/>
-    <extensionPoint qualifiedName="org.jetbrains.uast.uastLanguagePlugin" interface="org.jetbrains.uast.UastLanguagePlugin"/>
+    <extensionPoint qualifiedName="org.jetbrains.uast.uastLanguagePlugin" interface="org.jetbrains.uast.UastLanguagePlugin" dynamic="true"/>
     <extensionPoint qualifiedName="org.jetbrains.uast.analysis.uastAnalysisPlugin"
                     interface="org.jetbrains.uast.analysis.UastAnalysisPlugin"
                     dynamic="true"/>
diff --git a/platform/core-api/resources/META-INF/Core.xml b/platform/core-api/resources/META-INF/Core.xml
index d3a199676948..94c6f0a73752 100644
--- a/platform/core-api/resources/META-INF/Core.xml
+++ b/platform/core-api/resources/META-INF/Core.xml
@@ -20,7 +20,7 @@
     <extensionPoint name="editorFactoryDocumentListener" interface="com.intellij.openapi.editor.event.DocumentListener" dynamic="true"/>
     <extensionPoint name="multiHostInjector" interface="com.intellij.lang.injection.MultiHostInjector" area="IDEA_PROJECT" dynamic="true"/>
     <extensionPoint name="writingAccessProvider" area="IDEA_PROJECT" interface="com.intellij.openapi.vfs.WritingAccessProvider" dynamic="true"/>
-    <extensionPoint name="metaLanguage" interface="com.intellij.lang.MetaLanguage"/>
+    <extensionPoint name="metaLanguage" interface="com.intellij.lang.MetaLanguage" dynamic="true"/>
     <extensionPoint name="lang.parserDefinition" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
       <with attribute="implementationClass" implements="com.intellij.lang.ParserDefinition"/>
     </extensionPoint>