diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml
index 2186d0cfd54d5..bb5de81dcd88e 100644
--- a/libraries/docs/website/pom.xml
+++ b/libraries/docs/website/pom.xml
@@ -1,131 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0%20http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0%20http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
-        <version>0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
+  <parent>
+    <groupId>org.jetbrains.kotlin</groupId>
+    <artifactId>kotlin-project</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
 
-    <artifactId>website</artifactId>
-    <packaging>pom</packaging>
+  <artifactId>website</artifactId>
+  <packaging>pom</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>apidoc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.pegdown</groupId>
-            <artifactId>pegdown</artifactId>
-            <version>${pegdown.version}</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>apidoc</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.pegdown</groupId>
+      <artifactId>pegdown</artifactId>
+      <version>${pegdown.version}</version>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <sourceDirectory>src/main/kotlin</sourceDirectory>
+  <build>
+    <sourceDirectory>src/main/kotlin</sourceDirectory>
 
-        <plugins>
-            <plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${project.version}</version>
+    <plugins>
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <version>${project.version}</version>
 
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>prepare-package</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.jetbrains.kotlin.site.SitePackage</mainClass>
-                    <arguments>
-                        <argument>${basedir}</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>prepare-package</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>org.jetbrains.kotlin.site.SitePackage</mainClass>
+          <arguments>
+            <argument>${basedir}</argument>
+          </arguments>
+        </configuration>
+      </plugin>
 
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.1</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/zip.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-zip</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
 
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.scm</groupId>
-                <artifactId>maven-scm-provider-gitexe</artifactId>
-                <version>1.6</version>
-            </extension>
-            <extension>
-                <groupId>org.apache.maven.scm</groupId>
-                <artifactId>maven-scm-manager-plexus</artifactId>
-                <version>1.6</version>
-            </extension>
-            <extension>
-                <groupId>com.github.stephenc.wagon</groupId>
-                <artifactId>wagon-gitsite</artifactId>
-                <version>0.4.1</version>
-            </extension>
-        </extensions>
-    </build>
+      <plugin>
+        <groupId>com.github.github</groupId>
+        <artifactId>site-maven-plugin</artifactId>
+        <version>0.8</version>
+        <configuration>
+          <message>Update Kotlin API Docs (build ${build.number})</message>
+          <server>jetbrains-kotlin</server>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>site</goal>
+            </goals>
+            <phase>site</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
 
-    <distributionManagement>
-        <!--
-        To deploy this add this to your ~/.m2/settings.xml
+  </build>
 
-       <server>
-           <id>github-project-site</id>
-           <username>git</username>
-       </server>
-        -->
+  <scm>
+    <url>https://github.com/bashor/kotlin</url>
+    <connection>scm:git:git@github.com:bashor/kotlin.git</connection>
+    <developerConnection>scm:git:git@github.com:bashor/kotlin.git</developerConnection>
+  </scm>
 
-        <site>
-            <id>github-project-site</id>
-            <url>gitsite:git@github.com/JetBrains/kotlin.git</url>
-        </site>
-    </distributionManagement>
 </project>
diff --git a/libraries/maven-settings.xml b/libraries/maven-settings.xml
index 879b3c2e3350b..9ee2586daa7db 100644
--- a/libraries/maven-settings.xml
+++ b/libraries/maven-settings.xml
@@ -3,20 +3,20 @@
           xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-    <mirrors>
-        <mirror>
-            <mirrorOf>central</mirrorOf>
-            <name>repo</name>
-            <url>http://repository.jetbrains.com/remote-repos</url>
-            <id>repo</id>
-        </mirror>
-    </mirrors>
+  <mirrors>
+    <mirror>
+      <mirrorOf>central</mirrorOf>
+      <name>repo</name>
+      <url>http://repository.jetbrains.com/remote-repos</url>
+      <id>repo</id>
+    </mirror>
+  </mirrors>
 
-    <servers>
-        <server>
-            <id>jetbrains-kotlin</id>
-            <username>tc-kotlin</username>
-            <password>${tc-kotlin.password}</password>
-        </server>
-    </servers>
+  <servers>
+    <server>
+      <id>jetbrains-kotlin</id>
+      <!--<username>bashor</username>-->
+      <password>${KOTLIN_GITHUB_OAUTH}</password>
+    </server>
+  </servers>
 </settings>