diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
index b2cd30ee0c6..8fa08fa9c68 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
@@ -398,5 +398,7 @@ class QuickFixRegistrar : QuickFixContributor {
         SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE.registerFactory(ConvertExtensionToFunctionTypeFix)
 
         UNUSED_LAMBDA_EXPRESSION.registerFactory(AddRunToLambdaFix)
+
+        WRONG_LONG_SUFFIX.registerFactory(WrongLongSuffixFix)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongLongSuffixFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongLongSuffixFix.kt
new file mode 100644
index 00000000000..615d410541d
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongLongSuffixFix.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-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.kotlin.idea.quickfix
+
+import com.intellij.codeInsight.intention.IntentionAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.psi.KtConstantExpression
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtPsiFactory
+
+class WrongLongSuffixFix(element: KtConstantExpression) : KotlinQuickFixAction<KtConstantExpression>(element) {
+
+    private val corrected = element.text.trimEnd('l') + 'L'
+
+    override fun getText() = "Change to '$corrected'"
+    override fun getFamilyName() = "Change to correct long suffix 'L'"
+
+    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
+        element.replace(KtPsiFactory(project).createExpression(corrected))
+    }
+
+    companion object Factory: KotlinSingleIntentionActionFactory() {
+        override fun createAction(diagnostic: Diagnostic): IntentionAction {
+            val casted = Errors.WRONG_LONG_SUFFIX.cast(diagnostic)
+            return WrongLongSuffixFix(casted.psiElement)
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/wrongLongSuffix/simple.kt b/idea/testData/quickfix/wrongLongSuffix/simple.kt
new file mode 100644
index 00000000000..b40c2948bd0
--- /dev/null
+++ b/idea/testData/quickfix/wrongLongSuffix/simple.kt
@@ -0,0 +1,3 @@
+// "Change to '1L'" "true"
+
+val a: Long = 1l<caret>
\ No newline at end of file
diff --git a/idea/testData/quickfix/wrongLongSuffix/simple.kt.after b/idea/testData/quickfix/wrongLongSuffix/simple.kt.after
new file mode 100644
index 00000000000..4bcec477a23
--- /dev/null
+++ b/idea/testData/quickfix/wrongLongSuffix/simple.kt.after
@@ -0,0 +1,3 @@
+// "Change to '1L'" "true"
+
+val a: Long = 1L<caret>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 06d831fd02f..7ee42ae0cdd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -9010,4 +9010,19 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
     }
+
+    @TestMetadata("idea/testData/quickfix/wrongLongSuffix")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class WrongLongSuffix extends AbstractQuickFixTest {
+        public void testAllFilesPresentInWrongLongSuffix() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/wrongLongSuffix"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/wrongLongSuffix/simple.kt");
+            doTest(fileName);
+        }
+    }
 }