diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 590fafb..74f4665 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -190,6 +190,13 @@ esac
                   @role='installation' and
                   $pkgmngt = 'y'">
       <xsl:text>mkdir -pv $PKG_DEST/usr/include/{rpc,rpcsvc}
+</xsl:text>
+    </xsl:if>
+    <xsl:if test="../@id = 'ch-system-libelf' and
+                  @role='installation' and
+                  $pkgmngt = 'y' and
+                  $wrap-install = 'n'">
+      <xsl:text>mkdir -pv $PKG_DEST/usr/lib/pkgconfig
 </xsl:text>
     </xsl:if>
     <xsl:apply-templates
@@ -604,21 +611,22 @@ unset OLD_PKGDIR
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <xsl:when test="contains($outputstring,'ninja ')">
+      <xsl:when test="contains($outputstring,'ninja install')">
         <xsl:choose>
-          <xsl:when test="not(starts-with($outputstring,'ninja'))">
+          <xsl:when test="not(starts-with($outputstring,'ninja install'))">
             <xsl:call-template name="outputpkgdest">
               <xsl:with-param name="outputstring"
-                              select="substring-before($outputstring,'ninja')"/>
+                              select="substring-before($outputstring,'ninja install')"/>
             </xsl:call-template>
             <xsl:call-template name="outputpkgdest">
               <xsl:with-param
                  name="outputstring"
                  select="substring-after($outputstring,
-                                      substring-before($outputstring,'ninja'))"/>
+                                      substring-before($outputstring,'ninja install'))"/>
             </xsl:call-template>
           </xsl:when>
-          <xsl:otherwise> <!-- ninja is the first word -->
+          <xsl:otherwise> <!-- "ninja" is the first word and is followed by
+                                "install"-->
             <xsl:text>DESTDIR=$PKG_DEST ninja</xsl:text>
             <xsl:call-template name="outputpkgdest">
               <xsl:with-param