diff --git a/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java b/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java
index cd41a0c..da8738d 100644
--- a/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java
+++ b/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java
@@ -763,6 +763,7 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo {
         	pdfBuilder.setChapterAutolabel(getProperty("chapterAutolabel"));
         	pdfBuilder.setAppendixAutolabel(getProperty("appendixAutolabel"));
         	pdfBuilder.setSectionAutolabel(getProperty("sectionAutolabel"));
+        	pdfBuilder.setSectionLabelIncludesComponentLabel(getProperty("sectionLabelIncludesComponentLabel"));
 		pdfBuilder.setFormalProcedures(getProperty("formalProcedures"));
 		pdfBuilder.setGenerateToc(getProperty("generateToc"));
 		pdfBuilder.setTocMaxDepth(getProperty("tocMaxDepth"));
diff --git a/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java b/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java
index 3f05a6d..30e4bd9 100644
--- a/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java
+++ b/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java
@@ -112,6 +112,7 @@ public class PDFBuilder {
         private String chapterAutolabel;
         private String appendixAutolabel;
         private String sectionAutolabel;
+        private String sectionLabelIncludesComponentLabel;
         private String formalProcedures;
         private String generateToc;
         private String tocMaxDepth;
@@ -349,6 +350,9 @@ public class PDFBuilder {
 		if(null != sectionAutolabel){
 		    transformer.setParameter("section.autolabel", sectionAutolabel);
 		}
+		if(null != sectionLabelIncludesComponentLabel){
+		    transformer.setParameter("section.label.includes.component.label", sectionLabelIncludesComponentLabel);
+		}
 		if(null != chapterAutolabel){
 		    transformer.setParameter("chapter.autolabel", chapterAutolabel);
 		}
@@ -631,6 +635,14 @@ public class PDFBuilder {
 	public void setSectionAutolabel(String sectionAutolabel) {
 		this.sectionAutolabel = sectionAutolabel;
 	}
+
+	public String getSectionLabelIncludesComponentLabel() {
+		return sectionLabelIncludesComponentLabel;
+	}
+
+	public void setSectionLabelIncludesComponentLabel(String sectionLabelIncludesComponentLabel) {
+		this.sectionLabelIncludesComponentLabel = sectionLabelIncludesComponentLabel;
+	}
 	public String getFormalProcedures() {
 		return formalProcedures;
 	}
diff --git a/src/main/resources/cloud/fo/docbook.xsl b/src/main/resources/cloud/fo/docbook.xsl
index 8351581..5cd3821 100644
--- a/src/main/resources/cloud/fo/docbook.xsl
+++ b/src/main/resources/cloud/fo/docbook.xsl
@@ -160,7 +160,12 @@
   <!-- Numbering of sections and chapters -->
   <xsl:param name="chapter.autolabel" select="1"/>
   <xsl:param name="section.autolabel" select="1"/>
-  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="section.label.includes.component.label">
+    <xsl:choose>
+      <xsl:when test="$section.autolabel != '0'">1</xsl:when>
+      <xsl:otherwise>0</xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
 
   <!-- Define hard pagebreak -->
   <xsl:template match="processing-instruction('hard-pagebreak')">
diff --git a/src/main/resources/cloud/webhelp/docbook.xsl b/src/main/resources/cloud/webhelp/docbook.xsl
index 253355f..9d5628c 100644
--- a/src/main/resources/cloud/webhelp/docbook.xsl
+++ b/src/main/resources/cloud/webhelp/docbook.xsl
@@ -79,7 +79,7 @@
   <xsl:param name="qandadiv.autolabel" select="1"/>
   <xsl:param name="webhelp.autolabel" select="1"/>
   <xsl:param name="section.autolabel.max.depth" select="100"/>
-  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="section.label.includes.component.label" select="0"/>
   <xsl:param name="component.label.includes.part.label" select="1"/>
   <xsl:param name="ignore.image.scaling" select="1"/>
   <xsl:param name="suppress.footer.navigation">1</xsl:param>