--- scala-2.11.2.ebuild
+++ scala-2.11.2.ebuild
@@ -163,6 +163,8 @@
 			# java.lang.OutOfMemoryError: PermGen space
 			eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
 				docscomp
+			eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
+				docs
 		fi
 	else
 		einfo "Skipping compilation, USE=binary is set."
@@ -207,9 +209,9 @@
 	fi
 	popd
 
-	local docdir="build/scaladoc/compiler"
+	local docdir="build/scaladoc"
 	dodoc docs/TODO doc/README
 	if use doc; then
-		dohtml -r "${docdir}"
+		dohtml -r "${docdir}"/{compiler,library}
 	fi
 }