diff --git a/glossary.rst b/glossary.rst
new file mode 100644
index 0000000..a9e6d6d
--- /dev/null
+++ b/glossary.rst
@@ -0,0 +1,11 @@
+Glossary
+========
+- DBUF: Software service responsible of implementing the UPF Downlink buffering feature
+- DDN: Downlink Data Notification
+- PCP: Programmable Control Plane team, now merged with PDP into SD-Fabric
+- PDP: Programmable Data Plane team, now merged with PCP into SD-Fabric
+- QFI: QoS Flow Identifier
+- TOST: Trellis, ONOS, Stratum and Tofino, the predecessor of SD-Fabric (now obsolete)
+- TNA: Tofino Native Architecture
+- UPF: 5G User Plane Function
+- UP4: P4 implementation of UPF of control-stack based on ONOS