diff --git a/doc_src/en/Dialogs_ProjectProperties.xml b/doc_src/en/Dialogs_ProjectProperties.xml
index 3bb9f3b25d..dde6312685 100644
--- a/doc_src/en/Dialogs_ProjectProperties.xml
+++ b/doc_src/en/Dialogs_ProjectProperties.xml
@@ -125,9 +125,13 @@
 		  <para>Switching from <emphasis role="bold">sentence</emphasis> to
 		  <emphasis role="bold">paragraph</emphasis> segmentation
 		  mid-translation may force OmegaT to upgrade old translation memories
-		  that did not use sentence segmentation, but not vice versa. However,
-		  OmegaT will attempt to create fuzzy matches for paragraphs by
-		  combining existing sentence translations.</para>
+		  that did not use sentence segmentation, but not vice versa.</para>
+		  <para>OmegaT can also optionally attempt to create fuzzy matches for paragraphs
+		  by assembling existing sentence translations. See <link
+		  linkend="dialog.preferences.tm.matches.paragraph.from.segmented.tmx"
+		  endterm="dialog.preferences.tm.matches.paragraph.from.segmented.tmx.title"/> to enable
+		  that feature.
+		  </para>
 
 		  <para>If you change the segmentation while translating, you will have
 		  to reload the project for the new segmentation to take effect. This
diff --git a/doc_src/en/HowTo_UseTM.xml b/doc_src/en/HowTo_UseTM.xml
index 91395d547c..acd61e6317 100644
--- a/doc_src/en/HowTo_UseTM.xml
+++ b/doc_src/en/HowTo_UseTM.xml
@@ -165,6 +165,25 @@
 	  one of its subfolders and the translated data will be immediately be
 	  available for matching purposes.</para>
 	  </listitem>
+
+          <listitem>
+            <para>If you switch to paragraph segmentation in a project that originally used <link
+			    linkend="dialogs.project.properties.options.segmentation"
+			    endterm="dialogs.project.properties.options.segmentation.title"/>,
+		    you can have OmegaT present matches assembled from existing segments by enabling the
+		    <link
+	    linkend="dialog.preferences.tm.matches.paragraph.from.segmented.tmx"
+	    endterm="dialog.preferences.tm.matches.paragraph.from.segmented.tmx.title"/> option in addition to
+			showing regular fuzzy matches.</para>
+			<para> OmegaT will try to segment the source text into sentences,
+			apply fuzzy matching on the segmented memory entries, and then assemble a paragraph from those matches.
+		    The origins of the matches can be multiple files or memories because the assembled paragraph may not exist in the
+			translation memories.</para>
+		    <para>Refer to the <link linkend="dialog.preferences.segmentation.setup.type"
+			endterm="dialog.preferences.segmentation.setup.type.title"/> section for more information on
+		    the benefits and drawbacks of the different types of segmentation.
+            </para>
+          </listitem>
 	</itemizedlist>
 	
     <section id="how.to.tm.read.and.write">
diff --git a/doc_src/en/OmegaT_Preferences.xml b/doc_src/en/OmegaT_Preferences.xml
index da36d18220..c133af7fe1 100644
--- a/doc_src/en/OmegaT_Preferences.xml
+++ b/doc_src/en/OmegaT_Preferences.xml
@@ -1482,6 +1482,13 @@ ${filePath}></programlisting></para>
 		  </table>
 		</listitem>
 	  </varlistentry>
+          <varlistentry id="dialog.preferences.tm.matches.paragraph.from.segmented.tmx">
+		  <term id="dialog.preferences.tm.matches.paragraph.from.segmented.tmx.title">
+			  <option>Show matches assembled from multiple segments</option></term>
+            <listitem><para>Enable matches for paragraphs assembled from matches found in segmented
+		    memory entries from a segmented source text in a project that uses paragraph segmentation.</para>
+            </listitem>
+          </varlistentry>
 	</variablelist>
   </section>