diff --git a/akka-docs-dev/rst/scala/http/index-routing.rst b/akka-docs-dev/rst/scala/http/index-routing.rst
index b04f97e7d3..48e8201e8e 100644
--- a/akka-docs-dev/rst/scala/http/index-routing.rst
+++ b/akka-docs-dev/rst/scala/http/index-routing.rst
@@ -13,6 +13,7 @@ HTTP Routing
    exception-handling
    path-matchers
    marshalling
+   custom-directives
    directives/alphabetically
    directives/by-trait
 
diff --git a/akka-docs-dev/rst/scala/http/server.rst b/akka-docs-dev/rst/scala/http/server.rst
index 9756fe784c..f69cb100c9 100644
--- a/akka-docs-dev/rst/scala/http/server.rst
+++ b/akka-docs-dev/rst/scala/http/server.rst
@@ -4,7 +4,7 @@ Server API
 ==========
 
 The Akka HTTP server is an embedded, stream-based, fully asynchronous, low-overhead
-HTTP/1.1 server implemented on top of `Akka Streams`_. (todo: fix link)
+HTTP/1.1 server implemented on top of :ref:`streams-scala`.
 
 It sports the following features:
 
@@ -16,7 +16,6 @@ It sports the following features:
 
 .. _HTTP persistent connections: http://en.wikipedia.org/wiki/HTTP_persistent_connection
 .. _HTTP pipelining: http://en.wikipedia.org/wiki/HTTP_pipelining
-.. _Akka streams: http://akka.io/docs/
 
 
 Design Philosophy
@@ -154,4 +153,4 @@ field of an HTTP message:
 SSL Support
 -----------
 
-(todo)
\ No newline at end of file
+(todo)
diff --git a/akka-docs-dev/rst/scala/stream-index.rst b/akka-docs-dev/rst/scala/stream-index.rst
index f49f7d40f4..0a7c244710 100644
--- a/akka-docs-dev/rst/scala/stream-index.rst
+++ b/akka-docs-dev/rst/scala/stream-index.rst
@@ -1,3 +1,5 @@
+.. _streams-scala:
+
 Streams
 =======