diff --git a/examples/rider-plugin/build.gradle b/examples/rider-plugin/build.gradle
index 12836b72be..aba11c33a7 100644
--- a/examples/rider-plugin/build.gradle
+++ b/examples/rider-plugin/build.gradle
@@ -1,7 +1,3 @@
 intellij {
-    version 'RD-2018.1'
-}
-
-instrumentCode {
-    javac2 project.file('lib/javac2.jar')
+    version 'RD-2019.3-SNAPSHOT'
 }
\ No newline at end of file
diff --git a/examples/rider-plugin/lib/javac2.jar b/examples/rider-plugin/lib/javac2.jar
deleted file mode 100644
index 5887a89b1c..0000000000
Binary files a/examples/rider-plugin/lib/javac2.jar and /dev/null differ
diff --git a/src/main/groovy/org/jetbrains/intellij/IntelliJPlugin.groovy b/src/main/groovy/org/jetbrains/intellij/IntelliJPlugin.groovy
index 89e8f39f6a..16dd975d97 100644
--- a/src/main/groovy/org/jetbrains/intellij/IntelliJPlugin.groovy
+++ b/src/main/groovy/org/jetbrains/intellij/IntelliJPlugin.groovy
@@ -415,7 +415,16 @@ class IntelliJPlugin implements Plugin<Project> {
                 conventionMapping('compilerVersion', {
                     def version = extension.version ?: DEFAULT_IDEA_VERSION
                     if (version.endsWith('-SNAPSHOT')) {
-                        return extension.type == 'CL' ? "CLION-$version".toString() : version
+                        if (extension.type == 'CL') {
+                            return "CLION-$version".toString()
+                        }
+                        if (extension.type == 'RD') {
+                            return "RIDER-$version".toString()
+                        }
+                        if (extension.type == 'PY' || extension.type == 'PC') {
+                            return "PYCHARM-$version".toString()
+                        }
+                        return version
                     }
                     return IdeVersion.createIdeVersion(ideaDependency.buildNumber).asStringWithoutProductCode()
                 })
diff --git a/src/main/groovy/org/jetbrains/intellij/Utils.groovy b/src/main/groovy/org/jetbrains/intellij/Utils.groovy
index 89bdf5639e..f133c6fd67 100755
--- a/src/main/groovy/org/jetbrains/intellij/Utils.groovy
+++ b/src/main/groovy/org/jetbrains/intellij/Utils.groovy
@@ -284,7 +284,7 @@ class Utils {
         return targetDirectory
     }
 
-    private static def MAJOR_VERSION_PATTERN = Pattern.compile('\\d{4}\\.\\d-SNAPSHOT')
+    private static def MAJOR_VERSION_PATTERN = Pattern.compile('(RIDER-)?\\d{4}\\.\\d-SNAPSHOT')
     static String releaseType(@NotNull String version) {
         if (version.endsWith('-EAP-SNAPSHOT') || version.endsWith('-EAP-CANDIDATE-SNAPSHOT') || version.endsWith('-CUSTOM-SNAPSHOT') || MAJOR_VERSION_PATTERN.matcher(version).matches()) {
             return 'snapshots'