diff --git a/doc/common/glossary.rst b/doc/common/glossary.rst
index 68abf726cf..e4512e36ea 100644
--- a/doc/common/glossary.rst
+++ b/doc/common/glossary.rst
@@ -2853,7 +2853,7 @@ O
       alphabetical order: Austin, Bexar, Cactus, Diablo, Essex,
       Folsom, Grizzly, Havana, Icehouse, Juno, Kilo, Liberty,
       Mitaka, Newton, Ocata, Pike, Queens, Rocky, Stein,
-      Train, Ussuri, Victoria, and Wallaby.
+      Train, Ussuri, Victoria, Wallaby, Xena, and Yoga.
 
       Wallaby was the first code name choosen by a new policy: Code
       names are choosen by the community following the alphabet, for
@@ -4311,6 +4311,15 @@ X
       Graphics. Excels in parallel I/O operations and data
       consistency.
 
+Y
+~
+
+   Yoga
+
+      The code name for the twenty fifth release of OpenStack.
+      The release is named after a a philosophical school with mental
+      and physical practices from India.
+
 Z
 ~