diff --git a/documentation/18.07/faq/index.wiki b/documentation/18.07/faq/index.wiki
new file mode 100644
index 00000000..49490cc3
--- /dev/null
+++ b/documentation/18.07/faq/index.wiki
@@ -0,0 +1,11 @@
+[[Property:title|FAQ]]
+[[Property:description|Frequently Asked Questions]]
+[[Property:link_title|FAQ]]
+[[Property:weight|5]]
+[[Property:uuid|e604c263-249d-48d2-8238-b3d027ed04dd]]
+
+See existing Frequently Asked Questions pages:
+* [https://www.eiffel.com/resources/faqs/]
+* [https://www.eiffel.com/resources/faqs/eiffel-language/ General Eiffel FAQ]
+* [https://www.eiffel.com/resources/faqs/eiffel-studio/ EiffelStudio FAQ]
+
diff --git a/documentation/versions b/documentation/versions
index 170ba067..41b431fe 100644
--- a/documentation/versions
+++ b/documentation/versions
@@ -1,6 +1,6 @@
 trunk:trunk
-18.07:upcoming
-18.01:released
+18.07:released
+18.01
 17.05
 17.01
 16.05