diff --git a/akka-docs/rst/dev/building-akka.rst b/akka-docs/rst/dev/building-akka.rst
index 2d011a8ff9..100476fc0f 100644
--- a/akka-docs/rst/dev/building-akka.rst
+++ b/akka-docs/rst/dev/building-akka.rst
@@ -150,3 +150,13 @@ You can look at the Ivy dependency resolution information that is created on
 the resolution information for the akka-remote module compile dependencies. If
 you open this file in a web browser you will get an easy to navigate view of
 dependencies.
+
+Scaladoc Dependencies
+=====================
+
+The Scaladoc may generate Content (Type) Hierarchy diagrams. For this, you may
+be required to download and install Graphviz (http://www.graphviz.org/).
+The installed toolset has to be added to the PATH.
+
+Without Graphviz, the project will be completely built but with error messages
+regarding the absence of the diagram tool cumulated at the end.
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index de66c30a4c..54cf11c122 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -896,7 +896,7 @@ object AkkaBuild extends Build {
           val name = f.getName
           if (name.endsWith(".html") && !name.startsWith("index-") &&
             !(name.compare("index.html") == 0) && !(name.compare("package.html") == 0)) {
-            val source = scala.io.Source.fromFile(f)
+            val source = scala.io.Source.fromFile(f)("utf-8")
             val hd = source.getLines().exists(_.contains("<div class=\"toggleContainer block diagram-container\" id=\"inheritance-diagram-container\">"))
             source.close()
             hd