diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml
index 93e20841c87..8489d909e83 100644
--- a/libraries/docs/website/pom.xml
+++ b/libraries/docs/website/pom.xml
@@ -71,6 +71,12 @@
                     <arguments>
                         <argument>${basedir}</argument>
                     </arguments>
+                    <systemProperties>
+                        <systemProperty>
+                            <key>project.version</key>
+                            <value>${project.version}</value>
+                        </systemProperty>
+                    </systemProperties>
                 </configuration>
             </plugin>
 
diff --git a/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt b/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt
index b73b3cd51c5..7fd2c01b710 100644
--- a/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt
+++ b/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt
@@ -90,8 +90,8 @@ class SiteGenerator(val sourceDir: File, val outputDir: File) : Runnable {
             <ul class="nav">
               <li class="active"><a href="#">Home</a></li>
               <li><a href="http://confluence.jetbrains.net/display/Kotlin/Welcome" title="All the documentation is in the wiki">Documentation</a></li>
-              <li><a href="versions/snapshot/apidocs/index.html" title="Kotlin API documentation">API</a></li>
-              <li><a href="versions/snapshot/jsdocs/index.html" title="Kotlin JavaScript API documentation">JS</a></li>
+              <li><a href="versions/$versionDir/apidocs/index.html" title="Kotlin API documentation">API</a></li>
+              <li><a href="versions/$versionDir/jsdocs/index.html" title="Kotlin JavaScript API documentation">JS</a></li>
               <li><a href="http://blog.jetbrains.com/kotlin/">Blog</a></li>
               <li><a href="http://stackoverflow.com/questions/tagged/kotlin" title="Frequently Asked Questions">FAQ</a></li>
               <li><a href="http://devnet.jetbrains.net/community/kotlin" title="Join us for some kool chat!">Forum</a></li>
diff --git a/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGeneratorMain.kt b/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGeneratorMain.kt
index 262e6890516..6005b2372ff 100644
--- a/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGeneratorMain.kt
+++ b/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGeneratorMain.kt
@@ -2,14 +2,15 @@ package org.jetbrains.kotlin.site
 
 import java.io.File
 
+val version = System.getProperty("project.version") ?: "SNAPSHOT"
+val versionDir = if (version.contains("SNAPSHOT")) "snapshot" else version
+
 class SiteGeneratorMain(projectRoot: File) {
     val srcDir = File(projectRoot, "src/main/templates")
     val apiDocsDir = File(projectRoot, "../apidoc/target/site/apidocs")
     val jsApiDocsDir = File(projectRoot, "../jsdoc/target/site/apidocs")
     val siteOutputDir = File(projectRoot, "target/site")
 
-    val version = System.getProperty("project.version") ?: "SNAPSHOT"
-    val versionDir = if (version.contains("SNAPSHOT")) "snapshot" else version
 
     fun generateSite(): Unit {
         val generator = SiteGenerator(srcDir, siteOutputDir)