diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index e866606c5852..c32d10a8ced1 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -664,8 +664,9 @@ def setPluginVersionAndSince(String moduleName, String version) {
   if (file.isFile()) {
     def text = file.text
     if (!text.contains("<version>")) {
-      def nextMajorVersion = Integer.parseInt(version.substring(0, version.indexOf('.'))) + 1
-      file.text = text.replace("</id>", "</id>\n  <version>${version}</version>\n  <idea-version since-build=\"${version}\" until-build=\"${nextMajorVersion}.0\"/>\n")
+      def dotIndex = version.indexOf('.')
+      def untilBuild = dotIndex > 0 ? (Integer.parseInt(version.substring(0, dotIndex)) + 1).toString() + ".0" : version
+      file.text = text.replace("</id>", "</id>\n  <version>${version}</version>\n  <idea-version since-build=\"${version}\" until-build=\"${untilBuild}\"/>\n")
     }
   }
 }