diff --git a/README.rst b/README.rst
index 47d4033393f84971f124ac3f9d82655578469c65..d95d4535acc8890e61e878015b20dc74d6bb28d5 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,8 @@
 Silex, a simple Web Framework
 =============================
 
+**WARNING** Silex 1.x is not maintained anymore. Please, upgrade to Silex 2.x.
+
 Silex is a PHP micro-framework to develop websites based on `Symfony
 components`_::
 
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 55bd224f4a9ae4d0b6aa45b959d536b854be55f5..bf3c0654b10787339f5b20c7669c60deacee4cfa 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -1,10 +1,13 @@
 Changelog
 =========
 
-1.3.6 (2016-XX-XX)
+1.3.6 (2016-04-30)
 ------------------
 
-* n/a
+**WARNING** This is the last release of the Silex 1.x branch. Please, upgrade
+to Silex 2.x.
+
+* minor docs/tests changes
 
 1.3.5 (2016-01-06)
 ------------------
diff --git a/doc/intro.rst b/doc/intro.rst
index 2ab2bc3000847d85c7881e2a9c32b8fb95c5d65f..99551b89b3d0a5494a6caee7cfa04a2ef8221480 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -1,6 +1,9 @@
 Introduction
 ============
 
+**WARNINIG** You are reading documentation for the Silex 1.x branch, which is
+not maintained anymore. You should upgrade to Silex 2.x.
+
 Silex is a PHP microframework. It is built on the shoulders of `Symfony`_ and
 `Pimple`_ and also inspired by `Sinatra`_.