diff --git a/Scripts/parlamint-factorize-teiHeader.xsl b/Scripts/parlamint-factorize-teiHeader.xsl
index 281acc19e..2ab00d503 100755
--- a/Scripts/parlamint-factorize-teiHeader.xsl
+++ b/Scripts/parlamint-factorize-teiHeader.xsl
@@ -15,6 +15,8 @@
   <xsl:output method="xml" indent="yes" encoding="UTF-8" />
   <xsl:preserve-space elements="catDesc seg"/>
 
+  <xsl:import href="parlamint-lib.xsl"/>
+
   <xsl:variable name="pref">
     <xsl:choose>
       <xsl:when test="$prefix"><xsl:value-of select="$prefix"/></xsl:when>
@@ -118,6 +120,21 @@
     </xsl:element>
   </xsl:template>
 
+  <xsl:template match="tei:classDecl/xi:include | tei:particDesc/xi:include">
+    <xsl:variable name="path" select="concat($outDir,'/',@href)"/>
+    <xsl:message select="concat('INFO: Copying ',@href, ' to ',$path)"/>
+    <xsl:result-document href="{$path}" method="xml">
+      <xsl:apply-templates mode="XInclude" select="document(@href)"/>
+    </xsl:result-document>
+    <xsl:element name="xi:include" namespace="http://www.w3.org/2001/XInclude">
+      <xsl:namespace name="xi" select="'http://www.w3.org/2001/XInclude'"/>
+      <xsl:attribute name="href">
+        <xsl:value-of select="./@href"/>
+      </xsl:attribute>
+    </xsl:element>
+  </xsl:template>
+
+
   <xsl:template match="@scheme[. = '#parla.legislature']">
     <xsl:attribute name="scheme">#ParlaMint-taxonomy-parla.legislature</xsl:attribute>
   </xsl:template>
diff --git a/Scripts/parlamint2distro.pl b/Scripts/parlamint2distro.pl
index 57b803c14..b68e40a21 100755
--- a/Scripts/parlamint2distro.pl
+++ b/Scripts/parlamint2distro.pl
@@ -328,14 +328,11 @@ sub factorisations {
     if (@inTaxonomies) {$factorised = 1}
     elsif (not $procFactor) {print STDERR "WARN: $inTaxonomies not found\n"}
     if ($procFactor or $procCommon) {
-	if ($factorised) {print STDERR "INFO: $Dir already factorised\n"}
-	else {
-	    print STDERR "INFO: Factorising $Root\n";
-	    $tmpOutDir = "$tmpDir/factorise";
-	    #Doesn't work!
-	    #$Saxon noAna=\"$factoriseFiles\" $teiRootTaxonomies outDir=$tmpOutDir -xsl:$scriptFactor $Root`;
-	    #`cp $tmpOutDir/*.xml $Dir`;
-	}
+	if ($factorised) {print STDERR "INFO: $Dir already (fully/partially) factorised\n"}
+	print STDERR "INFO: Factorising $Root\n";
+	$tmpOutDir = "$tmpDir/factorise";
+	`$Saxon noAna=\"$factoriseFiles\" $teiRootTaxonomies outDir=$tmpOutDir -xsl:$scriptFactor $Root`;
+	`cp $tmpOutDir/*.xml $Dir`;
 	if ($procCommon) {
 	    foreach my $taxonomy (sort keys %taxonomy) {
 		#Eventually we will need an XSLT to extract from common taxonomies catDesc with relevant @xml:lang(s)!