diff --git a/Makefile b/Makefile
index 47bd2ec244..88a26e59eb 100644
--- a/Makefile
+++ b/Makefile
@@ -189,6 +189,7 @@ docs-website: dw_announce dw_1 dw_2 dw_3 dw_4
 
 docs-website-clean:
 	rm -rf h2o-docs/source/developuser/DocGen
+	rm -rf h2o-docs/source/developuser/ScalaGen
 	$(MAKE) -C h2o-docs clean
 endif
 
@@ -206,6 +207,8 @@ dw_1:
 	mkdir -p h2o-docs/source/developuser/DocGen
 	cd h2o-docs/source/developuser/DocGen && java -Xmx1g -jar "$(TOPDIR)/target/h2o.jar" -runClass water.api.DocGen -port $(PORT) -name $(TMPDIR) -ice_root $(TMPDIR) 1> /dev/null
 	rm -rf $(TMPDIR)
+	mkdir -p h2o-docs/source/developuser/ScalaGen
+	cp -p h2o-scala/README.rst h2o-docs/source/developuser/ScalaGen/README.rst
 
 # If this fails, you might need to do the following:
 #     $ (possibly sudo) easy_install pip
@@ -225,8 +228,6 @@ dw_3:
 	cp -p docs/H2O_on_Hadoop_0xdata.pdf $(BUILD_WEBSITE_DIR)/bits/hadoop
 	mkdir -p $(BUILD_WEBSITE_DIR)/bits/ec2
 	cp -p ec2/README.txt $(BUILD_WEBSITE_DIR)/bits/ec2
-	mkdir -p $(BUILD_WEBSITE_DIR)/bits/h2o-scala
-	cp -p h2o-scala/README.md $(BUILD_WEBSITE_DIR)/bits/h2o-scala/README.txt
 
 # Note:  to get pdfunite on a mac, try:
 #     $ brew install poppler
diff --git a/h2o-docs/source/developuser/quickstart_scala.rst b/h2o-docs/source/developuser/quickstart_scala.rst
deleted file mode 100644
index 1c0915d51a..0000000000
--- a/h2o-docs/source/developuser/quickstart_scala.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-H\ :sub:`2`\ O For Scala 
--------------------------------
-
-
-.. raw:: html
-
-    <div style="margin-top:10px;">
-      <iframe width=900 height=600 src="../bits/h2o-scala/README.txt" frameborder="0" allowfullscreen></iframe>
-    </div>
diff --git a/h2o-docs/source/developuser/top_developer.rst b/h2o-docs/source/developuser/top_developer.rst
index 1ef374806c..89578f536e 100644
--- a/h2o-docs/source/developuser/top_developer.rst
+++ b/h2o-docs/source/developuser/top_developer.rst
@@ -12,6 +12,6 @@ Getting Started with Development in H\ :sub:`2`\ O
    quickstart_eclipse
    quickstart_idea
    quickstart_mac
-   quickstart_scala
+   ScalaGen/README
    java
    rest
diff --git a/h2o-docs/source/index.rst b/h2o-docs/source/index.rst
index 682ce35f91..bbb4d24b02 100644
--- a/h2o-docs/source/index.rst
+++ b/h2o-docs/source/index.rst
@@ -22,7 +22,7 @@ This section is for new users, and provides information about how to install and
    Ruser/Rinstall
    Ruser/R_studio
    newuser/ec2
-   developuser/quickstart_scala.rst
+   developuser/ScalaGen/README
 
 .. toctree::
    :maxdepth: 2
diff --git a/h2o-scala/README.rst b/h2o-scala/README.rst
index 4cc7a9ac54..2f015d51f1 100644
--- a/h2o-scala/README.rst
+++ b/h2o-scala/README.rst
@@ -1,6 +1,6 @@
 
-Shalala
-=======
+Scala for H\ :sub:`2`\ O: Shalala
+===================================
 
 Overview
 --------
@@ -71,7 +71,7 @@ You can start REPL via `sbt`:
 
 
 Key points of implementation
-----------
+----------------------------
 * Using primitive types specialization (to allow for generation code using primitive types)
 * All objects passed around cloud has to inherits from `water.Iced`