diff --git a/python/psi-api/src/com/jetbrains/python/PyNames.java b/python/psi-api/src/com/jetbrains/python/PyNames.java
index d73539b2f8ef..95bb618b0cd0 100644
--- a/python/psi-api/src/com/jetbrains/python/PyNames.java
+++ b/python/psi-api/src/com/jetbrains/python/PyNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * 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.
@@ -360,7 +360,7 @@ public class PyNames {
     .put("__rmod__", _self_other_descr)
     .put("__rmul__", _self_other_descr)
     .put("__ror__", _self_other_descr)
-    .put("__rpow__", new BuiltinDescription("(self, power, modulo=None)"))
+    .put("__rpow__", _self_other_descr)
     .put("__rrshift__", _self_other_descr)
     .put("__rshift__", _self_other_descr)
     .put("__rsub__", _self_other_descr)
diff --git a/python/testData/completion/rPowSignature.after.py b/python/testData/completion/rPowSignature.after.py
new file mode 100644
index 000000000000..986aea181170
--- /dev/null
+++ b/python/testData/completion/rPowSignature.after.py
@@ -0,0 +1,2 @@
+class Cl(object):
+  def __rpow__(self, other):
\ No newline at end of file
diff --git a/python/testData/completion/rPowSignature.py b/python/testData/completion/rPowSignature.py
new file mode 100644
index 000000000000..128c85c9ee2f
--- /dev/null
+++ b/python/testData/completion/rPowSignature.py
@@ -0,0 +1,2 @@
+class Cl(object):
+  def __rp<caret>
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
index a1fddd101de9..7a86eea87a4a 100644
--- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * 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.
@@ -981,6 +981,11 @@ public class PythonCompletionTest extends PyTestCase {
     doMultiFileTest();
   }
 
+  // PY-18684
+  public void testRPowSignature() {
+    doTest();
+  }
+
   @Override
   protected String getTestDataPath() {
     return super.getTestDataPath() + "/completion";