diff --git a/en_US.ISO8859-1/slides/freebsd-general/slides.xml b/en_US.ISO8859-1/slides/freebsd-general/slides.xml
index ae52fffa9c..d0aa9f88e4 100644
--- a/en_US.ISO8859-1/slides/freebsd-general/slides.xml
+++ b/en_US.ISO8859-1/slides/freebsd-general/slides.xml
@@ -2,7 +2,22 @@
 
 <!-- $FreeBSD$ -->
 
-<!DOCTYPE slides SYSTEM "/usr/local/share/xsl/slides/schema/dtd/slides.dtd">
+<!DOCTYPE slides SYSTEM
+"/usr/local/share/xsl/slides/schema/dtd/slides.dtd" [
+<!ENTITY % freebsd SYSTEM "../../../share/sgml/freebsd.ent">
+%freebsd;
+<!ENTITY slides.what-is-freebsd SYSTEM "../common/what-is-freebsd.xml">
+<!ENTITY slides.freebsd-users SYSTEM "../common/freebsd-users.xml">
+<!ENTITY slides.freebsd-dev-model SYSTEM "../common/freebsd-dev-model.xml">
+<!ENTITY slides.freebsd-release-process SYSTEM 
+  "../common/freebsd-release-process.xml">
+<!ENTITY slides.freebsd-recent-releases SYSTEM
+  "../common/freebsd-recent-releases.xml">
+<!ENTITY slides.freebsd-organization SYSTEM
+  "../common/freebsd-organization.xml">
+<!ENTITY slides.freebsd-5.3 SYSTEM "../common/freebsd-5.3.xml">
+]>
+
 <?dbhtml graphics-dir="/usr/local/share/xsl/slides/graphics" css-stylesheet-dir="/usr/local/share/xsl/slides/browser"?>
 <?dbhtml script-dir="/usr/local/share/xsl/slides/browser"?>
 <slides>
@@ -24,6 +39,7 @@
 <foil id="intro-outline"><title>Outline</title>
   <itemizedlist>
     <listitem>What is FreeBSD?</listitem>
+    <listitem>Who uses FreeBSD?</listitem>
     <listitem>FreeBSD Development Model</listitem>
     <listitem>FreeBSD Release / Branch Terminology</listitem>
     <listitem>Recent FreeBSD Releases</listitem>
@@ -37,28 +53,25 @@
 
 <!-- Include the 'What is FreeBSD' slides. -->
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/what-is-freebsd.xml"/>
+&slides.what-is-freebsd;
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/freebsd-dev-model.xml"/>
+&slides.freebsd-users;
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/freebsd-release-process.xml"/>
+&slides.freebsd-dev-model;
+
+&slides.freebsd-release-process;
 
 <!-- Include the 'Recent Releases' slides. -->
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/freebsd-recent-releases.xml"/>
+&slides.freebsd-recent-releases;
 
 <!-- XXX this should be right after dev model. -->
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/freebsd-organization.xml"/>
+
+&slides.freebsd-organization;
 
 <!-- Slides about 'FreeBSD 5.3' -->
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/freebsd-5.3.xml"/>
+&slides.freebsd-5.3;
 
 <foil id="More information"><title>More Information</title>
   <itemizedlist>