diff --git a/README.md b/README.md
index 3312fa365080de423594b4614cc62bc3f7f605e6..9d3a6c934f4dafd56f5215b4c1acef1bd5d6d37f 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Zig is an open-source programming language designed for **robustness**,
  * [Download & Documentation](https://ziglang.org/download)
  * [Community](https://github.com/ziglang/zig/wiki/Community)
  * [Contributing](https://github.com/ziglang/zig/blob/master/CONTRIBUTING.md)
+ * [Frequently Asked Questions](https://github.com/ziglang/zig/wiki/FAQ)
 
 ## Building from Source
 
diff --git a/doc/langref.html.in b/doc/langref.html.in
index 4bd594c113d4970f3d340e9c5373f3e8d7b3027d..cdf302d5c4568f981983f0a0fe97a4869ad4117f 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -156,6 +156,11 @@
     </style>
   </head>
   <body>
+    <a href="https://ziglang.org/documentation/0.1.1">0.1.1</a> |
+    <a href="https://ziglang.org/documentation/0.2.0">0.2.0</a> |
+    <a href="https://ziglang.org/documentation/0.3.0">0.3.0</a> |
+    <a href="https://ziglang.org/documentation/0.4.0">0.4.0</a> |
+    master
     <div id="contents">
       {#header_open|Introduction#}
       <p>
@@ -182,6 +187,9 @@
       The code samples in this document are compiled and tested as part of the main test suite of Zig.
       This HTML document depends on no external files, so you can use it offline.
       </p>
+      <p>
+      <a href="https://github.com/ziglang/zig/wiki/FAQ#where-is-the-documentation-for-the-zig-standard-library">Where is the documentation for the Zig standard library?</a>
+      </p>
       {#header_close#}
 
       {#header_open|Index#}
