diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index e3d8d9904322..1ebe273012ab 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -355,6 +355,8 @@
     <renamePsiElementProcessor implementation="org.jetbrains.plugins.groovy.transformations.impl.synch.SynchronizedRenameFieldProcessor"
                                order="first, before groovyFieldRenameProcessor"/>
 
+    <automaticRenamerFactory implementation="org.jetbrains.plugins.groovy.refactoring.rename.GroovyAutomaticOverloadsRenamerFactory"/>
+
     <rename.inplace.resolveSnapshotProvider language="Groovy"
                                             implementationClass="org.jetbrains.plugins.groovy.refactoring.rename.inplace.GroovyResolveSnapshotProvider"/>
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/GroovyAutomaticOverloadsRenamerFactory.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/GroovyAutomaticOverloadsRenamerFactory.kt
new file mode 100644
index 000000000000..22389f08fa90
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/GroovyAutomaticOverloadsRenamerFactory.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2000-2016 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.refactoring.rename
+
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiMethod
+import com.intellij.refactoring.rename.naming.AutomaticOverloadsRenamer
+import com.intellij.refactoring.rename.naming.AutomaticOverloadsRenamerFactory
+import com.intellij.refactoring.rename.naming.AutomaticRenamer
+import com.intellij.usageView.UsageInfo
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrReflectedMethod
+
+class GroovyAutomaticOverloadsRenamerFactory : AutomaticOverloadsRenamerFactory() {
+
+  override fun isApplicable(element: PsiElement): Boolean {
+    if (element !is GrMethod || element.isConstructor) return false
+    val containingClass = element.containingClass ?: return false
+    val allSameNameMethods = containingClass.findMethodsByName(element.name, false)
+    return allSameNameMethods.filter {
+      it !is GrReflectedMethod || it.baseMethod !== element
+    }.isNotEmpty()
+  }
+
+  override fun createRenamer(element: PsiElement?, newName: String?, usages: MutableCollection<UsageInfo>?): AutomaticRenamer {
+    return object : AutomaticOverloadsRenamer(element as GrMethod, newName) {
+      override fun getOverloads(method: PsiMethod): Array<out PsiMethod> {
+        val containingClass = method.containingClass ?: return PsiMethod.EMPTY_ARRAY
+        val allSameNameMethods = containingClass.findMethodsByName(method.name, false)
+        return allSameNameMethods.mapNotNullTo(mutableSetOf()) {
+          if (it !is GrReflectedMethod) {
+            it
+          }
+          else {
+            val baseMethod = it.baseMethod
+            if (baseMethod !== method) baseMethod else null
+          }
+        }.toTypedArray()
+      }
+    }
+  }
+}
\ No newline at end of file