diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a069fa1a433..c5813a2547f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -551,6 +551,8 @@ Other Changes
 
 * SOLR-11037: Refactor to provide NodeConfig.getSolrDataHome internal API. (ab, janhoy, shalin)
 
+* SOLR-11119: Switch from Trie to Points field types in the .system collection schema. (Steve Rowe)
+
 ==================  6.7.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/resources/SystemCollectionSchema.xml b/solr/core/src/resources/SystemCollectionSchema.xml
index d491480ecf6..0c33022cc28 100644
--- a/solr/core/src/resources/SystemCollectionSchema.xml
+++ b/solr/core/src/resources/SystemCollectionSchema.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
 <schema name="_system collection or core" version="1.1">
   <fieldtype name="string"  class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
-  <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+  <fieldType name="long" class="solr.LongPointField" docValues="true" positionIncrementGap="0"/>
   <fieldType name="bytes" class="solr.BinaryField"/>
-  <fieldType name="date" class="solr.TrieDateField"/>
+  <fieldType name="date" class="solr.DatePointField" docValues="true"/>
   <field name="id"   type="string"   indexed="true"  stored="true"  multiValued="false" required="true"/>
   <field name="md5"   type="string"   indexed="true"  stored="true"  multiValued="false" required="true"/>
   <field name="blob"      type="bytes"   indexed="false" stored="true"  multiValued="false" />