diff --git a/etc/default.nix b/etc/default.nix
index b09f8ca794f..f9d567d20a9 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -125,6 +125,7 @@ import ../helpers/make-etc.nix {
         inherit (pkgs) fontconfig;
       }
       "xsltproc --stringparam fontDirectories \"$fontDirectories\" \\
+          --stringparam fontconfig \"$fontconfig\" \\
           ${./fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
           > $out
       ";
diff --git a/etc/fonts/make-fonts-conf.xsl b/etc/fonts/make-fonts-conf.xsl
index 73deb41c65e..f716700d98e 100644
--- a/etc/fonts/make-fonts-conf.xsl
+++ b/etc/fonts/make-fonts-conf.xsl
@@ -15,12 +15,19 @@
   <xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" />
 
   <xsl:param name="fontDirectories" />
+  <xsl:param name="fontconfig" />
 
   <xsl:template match="/fontconfig">
 
     <fontconfig>
-      <xsl:copy-of select="child::node()[name() != 'dir']" />
+      <xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
 
+      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
+      <include ignore_missing="yes" xml:space="preserve">/etc/fonts/conf.d</include>
+      
+      <cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
+      <cachedir xml:space="preserve">~/.fontconfig</cachedir>
+      
       <xsl:for-each select="str:tokenize($fontDirectories)">
         <dir><xsl:value-of select="." /></dir>
         <xsl:text>&#0010;</xsl:text>
@@ -30,4 +37,4 @@
 
   </xsl:template>
   
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>