diff --git a/plugins/groovy/jetgroovy.iml b/plugins/groovy/jetgroovy.iml
index 4ae317b2555c..c06341abadd7 100644
--- a/plugins/groovy/jetgroovy.iml
+++ b/plugins/groovy/jetgroovy.iml
@@ -37,6 +37,6 @@
     <orderEntry type="module" module-name="properties-psi-api" />
     <orderEntry type="module" module-name="groovy-psi" exported="" />
     <orderEntry type="module" module-name="external-system-api" />
+    <orderEntry type="module" module-name="RegExpSupport" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index ea356d13e917..6d171987ccd5 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -598,6 +598,9 @@
     <copyPastePreProcessor implementation="org.jetbrains.plugins.groovy.editor.GroovyLiteralCopyPasteProcessor"/>
     <copyPastePostProcessor implementation="org.jetbrains.plugins.groovy.editor.GroovyReferenceCopyPasteProcessor"/>
 
+    <regExpLanguageHost forClass="org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.literals.GrLiteralImpl"
+                        implementationClass="org.jetbrains.plugins.groovy.regexp.GroovyRegExpHost"/>
+
     <localInspection shortName="GroovyUnusedDeclaration" displayName="Unused declaration"
                      groupPath="Groovy"
                      groupName="Declaration redundancy" enabledByDefault="true" level="WARNING"
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/regexp/GroovyRegExpHost.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/regexp/GroovyRegExpHost.java
new file mode 100644
index 000000000000..c0f3616a08d2
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/regexp/GroovyRegExpHost.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.regexp;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtilCore;
+import com.intellij.psi.impl.JavaRegExpHost;
+import org.intellij.lang.regexp.psi.RegExpGroup;
+import org.jetbrains.plugins.groovy.config.GroovyConfigUtils;
+
+/**
+ * @author Bas Leijdekkers
+ */
+public class GroovyRegExpHost extends JavaRegExpHost {
+
+  @Override
+  public boolean supportsNamedGroupSyntax(RegExpGroup group) {
+    if (group.isNamedGroup()) {
+      final Module module = ModuleUtilCore.findModuleForPsiElement(group);
+      if (module != null) {
+        final String version = GroovyConfigUtils.getInstance().getSDKVersion(module);
+        return version != null && version.compareTo(GroovyConfigUtils.GROOVY2_0) >= 0;
+      }
+    }
+    return false;
+  }
+}