diff --git a/mail/mail-server/Portfile b/mail/mail-server/Portfile
index 5190bfb879a..41a0da8da26 100644
--- a/mail/mail-server/Portfile
+++ b/mail/mail-server/Portfile
@@ -5,7 +5,7 @@ PortGroup               active_variants 1.1
 
 name                    mail-server
 version                 1.6.0
-revision                0
+revision                1
 categories              mail net
 supported_archs         noarch
 maintainers             {ieee.org:s.t.smith @essandess} openmaintainer
diff --git a/mail/mail-server/files/prefix/var/solr/dovecot/conf/solrconfig.xml b/mail/mail-server/files/prefix/var/solr/dovecot/conf/solrconfig.xml
index 8b001aebaea..f113e62e5dc 100644
--- a/mail/mail-server/files/prefix/var/solr/dovecot/conf/solrconfig.xml
+++ b/mail/mail-server/files/prefix/var/solr/dovecot/conf/solrconfig.xml
@@ -37,54 +37,18 @@
   -->
   <luceneMatchVersion>9.8</luceneMatchVersion>
 
-  <!-- <lib/> directives can be used to instruct Solr to load any Jars
-       identified and use them to resolve any "plugins" specified in
-       your solrconfig.xml or schema.xml (ie: Analyzers, Request
-       Handlers, etc...).
+  <!-- You need to add enable the use of the `analysis-extras` module, by either:
 
-       All directories and paths are resolved relative to the
-       instanceDir.
+       * modifying the "solr.modules" parameter in solr.xml to include "analysis-extras",
+         e.g. set: <str name="modules">${solr.modules:analysis-extras}</str>
+       * adding "-Dsolr.modules=analysis-extras" to the solr start command line;
+       * setting the "SOLR_MODULES=analysis-extras" environment variable before starting
+         solr.
 
-       Please note that <lib/> directives are processed in the order
-       that they appear in your solrconfig.xml file, and are "stacked"
-       on top of each other when building a ClassLoader - so if you have
-       plugin jars with dependencies on other jars, the "lower level"
-       dependency jars should be loaded first.
-
-       If a "./lib" directory exists in your instanceDir, all files
-       found in it are included as if you had used the following
-       syntax...
-
-              <lib dir="./lib" />
+       If there are other modules that need be listed, you can use a comma-delimeted list
+       (e.g. "analysis-extras,<other module>").
     -->
 
-  <!-- A 'dir' option by itself adds any files found in the directory
-       to the classpath, this is useful for including all jars in a
-       directory.
-
-       When a 'regex' is specified in addition to a 'dir', only the
-       files in that directory which completely match the regex
-       (anchored on both ends) will be included.
-
-       If a 'dir' option (with or without a regex) is used and nothing
-       is found that matches, a warning will be logged.
-
-       The example below can be used to load a Solr Module along
-       with their external dependencies.
-    -->
-    <!-- <lib dir="${solr.install.dir:../../../..}/modules/ltr/lib" regex=".*\.jar" /> -->
-
-    <!-- Load ICU analyser -->
-    <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" regex="icu4j-.*\.jar"/>
-    <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" regex="lucene-analysis-icu-.*\.jar"/>
-  <!-- an exact 'path' can be used instead of a 'dir' to specify a
-       specific jar file.  This will cause a serious error to be logged
-       if it can't be loaded.
-    -->
-  <!--
-     <lib path="../a-jar-that-does-not-exist.jar" />
-  -->
-
   <!-- Data Directory
 
        Used to specify an alternate directory to hold all index data
@@ -259,16 +223,9 @@
          is recommended (see below).
          "dir" - the target directory for transaction logs, defaults to the
                 solr data directory.
-         "numVersionBuckets" - sets the number of buckets used to keep
-                track of max version values when checking for re-ordered
-                updates; increase this value to reduce the cost of
-                synchronizing access to version buckets during high-volume
-                indexing, this requires 8 bytes (long) * numVersionBuckets
-                of heap space per Solr core.
     -->
     <updateLog>
       <str name="dir">${solr.ulog.dir:}</str>
-      <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int>
     </updateLog>
 
     <!-- AutoCommit
@@ -688,7 +645,7 @@
   <!-- Shared parameters for multiple Request Handlers -->
   <initParams path="/update/**,/query,/select,/spell">
     <lst name="defaults">
-      <str name="df">_text_</str>
+      <str name="hdr">_text_</str>
     </lst>
   </initParams>