diff --git a/doc/networking-guide/source/index.rst b/doc/networking-guide/source/index.rst
index f84f56cd14..50e0c25432 100644
--- a/doc/networking-guide/source/index.rst
+++ b/doc/networking-guide/source/index.rst
@@ -31,7 +31,7 @@ Contents
 
    common/app_support.rst
 
-   glossary.rst
+   common/glossary.rst
 
 Search in this guide
 ~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/user-guides/source/index-admin.rst b/doc/user-guides/source/index-admin.rst
index c93b61f906..5e9080cd9c 100644
--- a/doc/user-guides/source/index-admin.rst
+++ b/doc/user-guides/source/index-admin.rst
@@ -28,7 +28,7 @@ Contents
 
    common/app_support.rst
 
-   glossary.rst
+   common/glossary.rst
 
 Search in this guide
 ~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/user-guides/source/index.rst b/doc/user-guides/source/index.rst
index 1e8ecac58f..d2c877bd0b 100644
--- a/doc/user-guides/source/index.rst
+++ b/doc/user-guides/source/index.rst
@@ -31,7 +31,7 @@ Contents
 
    common/app_support.rst
 
-   glossary.rst
+   common/glossary.rst
 
 Search in this guide
 ~~~~~~~~~~~~~~~~~~~~
diff --git a/tools/build-rst.sh b/tools/build-rst.sh
index 3a9e7c77d3..7aeaa2279c 100755
--- a/tools/build-rst.sh
+++ b/tools/build-rst.sh
@@ -56,7 +56,7 @@ done
 
 if [ "$GLOSSARY" -eq "1" ] ; then
     echo "Generating Glossary"
-    tools/glossary2rst.py $DIRECTORY/source/glossary.rst
+    tools/glossary2rst.py doc/common-rst/glossary.rst
 fi
 
 if [ -z "BUILD" ] ; then
diff --git a/tools/generatepot-rst.sh b/tools/generatepot-rst.sh
index f6ea0186ec..3b5230cc57 100755
--- a/tools/generatepot-rst.sh
+++ b/tools/generatepot-rst.sh
@@ -31,7 +31,7 @@ if [ "$DOCNAME" = "user-guides" ] ; then
 fi
 
 # Build Glossary
-tools/glossary2rst.py > doc/user-guides/source/glossary.rst
+tools/glossary2rst.py doc/common-rst/glossary.rst
 # First remove the old pot file, otherwise the new file will contain
 # old references
 rm -f doc/$DOCNAME/source/locale/$DOCNAME.pot
diff --git a/tox.ini b/tox.ini
index 9cb2df31a5..aca12539be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,6 @@ commands =
   mkdir -p publish-docs/user-guide-admin/
   rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/
   # Build RST networking guide
-  {toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst
   sphinx-build -E -W doc/networking-guide/source doc/networking-guide/build/html
   mkdir -p publish-docs/networking-guide/
   rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/
@@ -64,12 +63,11 @@ commands =
 [testenv:docs]
 commands =
   {toxinidir}/tools/build-user-guides.sh
-  {toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst
   sphinx-build -W doc/networking-guide/source doc/networking-guide/build/html
 
 [testenv:network]
 commands =
-  {toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst
+  {toxinidir}/tools/glossary2rst.py doc/common-rst/glossary.rst
   sphinx-build -W doc/networking-guide/source doc/networking-guide/build/html
 
 [testenv:publishdocs]
@@ -101,7 +99,6 @@ commands =
   mkdir -p publish-docs/user-guide-admin/
   rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/
   # Build RST Networking Guide
-  {toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst
   sphinx-build -W doc/networking-guide/source doc/networking-guide/build/html
   # Copy RST Networking Guide
   mkdir -p publish-docs/networking-guide/