diff --git a/mps/manual/source/glossary/index.rst b/mps/manual/source/glossary/index.rst
index 9a426a5e742..40656261350 100644
--- a/mps/manual/source/glossary/index.rst
+++ b/mps/manual/source/glossary/index.rst
@@ -33,6 +33,9 @@ Memory Management Glossary
    w
    z
 
+All
+===
+
 :term:`absolute address <physical address>`
 :term:`activation frame <activation record>`
 :term:`activation record`
diff --git a/mps/manual/source/themes/mmref/static/mmref.css_t b/mps/manual/source/themes/mmref/static/mmref.css_t
index ceab4faddef..f16758a7391 100644
--- a/mps/manual/source/themes/mmref/static/mmref.css_t
+++ b/mps/manual/source/themes/mmref/static/mmref.css_t
@@ -2,6 +2,11 @@
 
 @import url('scrolls.css');
 
+sup {
+    vertical-align: top;
+    font-size: 80%;
+}
+
 dl.glossary dt {
     font-family: {{ theme_headfont }};
 }
@@ -135,7 +140,22 @@ div#home h1 + p {
     padding-top: 15px;
 }
 
-div#memory-management-glossary em.xref.std-term {
-    white-space: nowrap;
-    margin-right: 1em;
+/* Format the glossary index in two columns. */
+
+div#memory-management-glossary div#all {
+    -webkit-columns: 2;
+    -moz-columns: 2;
+    -o-columns: 2;
+    -ms-columns: 2;
+    columns: 2;
+    padding-top: 1em;
+}
+
+div#memory-management-glossary div#all h2 {
+    display: none;
+}
+
+div#memory-management-glossary div#all a.reference.internal:after {
+    content: "\A";
+    white-space: pre;
 }
diff --git a/mps/manual/source/themes/mps/static/mps.css_t b/mps/manual/source/themes/mps/static/mps.css_t
index 6b0e20d0eb4..5904c165580 100644
--- a/mps/manual/source/themes/mps/static/mps.css_t
+++ b/mps/manual/source/themes/mps/static/mps.css_t
@@ -188,7 +188,7 @@ p.glossary-alphabet {
 }
 
 sup {
-    vertical-align: 20%;
+    vertical-align: top;
     font-size: 80%;
 }
 
@@ -220,3 +220,22 @@ li.toctree-l1, li.toctree-l2, li.toctree-l3 {
     padding-top: 0 !important;
 }
 
+/* Format the glossary index in two columns. */
+
+div#memory-management-glossary div#all {
+    -webkit-columns: 2;
+    -moz-columns: 2;
+    -o-columns: 2;
+    -ms-columns: 2;
+    columns: 2;
+    padding-top: 1em;
+}
+
+div#memory-management-glossary div#all h2 {
+    display: none;
+}
+
+div#memory-management-glossary div#all a.reference.internal:after {
+    content: "\A";
+    white-space: pre;
+}