diff --git a/test/doxygen/boost/example.hpp b/test/doxygen/boost/example.hpp
index 58086a1..c773f7b 100644
--- a/test/doxygen/boost/example.hpp
+++ b/test/doxygen/boost/example.hpp
@@ -1,8 +1,20 @@
+/*!
+    \class example
+    
+    \brief Documentation for class example (why isn't this working?)
+ */
+
+/*!
+    \def EXAMPLE
+    
+    \brief Documentation for macro example
+ */
+
 int global_integer;
 static int global_static_integer;
 const int global_const_integer = 1;
 static const int global_static_const_integer = 2;
-enum global_enum { enumerator };
+enum global_enum { enumerator1 = 1, enumerator2 };
 
 namespace example
 {
@@ -43,7 +55,35 @@ namespace example
         enum private_class_enum { enumerator3 };
     };
     
+    /**
+     * Test some doxygen markup
+     *
+     * Embedded docbook list:
+     *
+     * \xmlonly
+     * <orderedlist><listitem>1</listitem><listitem>2</listitem></orderedlist>
+     * \endxmlonly
+     *
+     * \a Special \b Bold \c Typewriter \e Italics \em emphasis \p parameter
+     *
+     * \arg Arg1 first argument.
+     * \arg Arg2 second argument.
+     *
+     * \li First list item.
+     * \li Second list item
+     *
+     * Line 1\n
+     * Line 2
+     *
+     * \code
+     *     void foo() {}
+     * \endcode
+     *
+     */
+
     template <typename TypeParameter, int NonTypeParameter,
         typename TypeParameterWithDefault = int>
     struct example_template {};
 }
+
+#define EXAMPLE(m) The macro
\ No newline at end of file
diff --git a/xsl/doxygen/doxygen2boostbook.xsl b/xsl/doxygen/doxygen2boostbook.xsl
index 63a949c..4a82f2a 100644
--- a/xsl/doxygen/doxygen2boostbook.xsl
+++ b/xsl/doxygen/doxygen2boostbook.xsl
@@ -308,7 +308,7 @@
 
           <xsl:if test="initializer">
             <default>
-              <xsl:apply-templates select="initializer" mode="passthrough"/>
+              <xsl:apply-templates select="initializer/*|initializer/text()" mode="passthrough"/>
             </default>
           </xsl:if>
 
@@ -1216,12 +1216,13 @@
     </xsl:if>
   </xsl:template>
 
-  <xsl:template match="computeroutput|orderedlist|itemizedlist|listitem" 
-    mode="passthrough">
-    <xsl:element name="{name(.)}">
+  <xsl:template match="*" mode="passthrough">
+    <xsl:copy>
+      <xsl:copy-of select="@*"/>
       <xsl:apply-templates mode="passthrough"/>
-    </xsl:element>
+    </xsl:copy>
   </xsl:template>
+
   <xsl:template match="parameterlist" mode="passthrough"/>
 
   <xsl:template match="bold" mode="passthrough">
@@ -1230,6 +1231,10 @@
     </emphasis>
   </xsl:template>
 
+  <xsl:template match="linebreak" mode="passthrough">
+    <sbr/>
+  </xsl:template>
+
   <xsl:template match="briefdescription" mode="passthrough">
     <xsl:if test="text()|*">
       <purpose>
@@ -1254,6 +1259,12 @@
     </xsl:if>
   </xsl:template>
 
+  <!-- Ignore ref elements for now, as there is a lot of documentation which
+       will have incorrect ref elements at the moment -->
+  <xsl:template match="ref" mode="passthrough">
+    <xsl:apply-templates mode="passthrough"/>
+  </xsl:template>
+
   <!-- Handle function clauses -->
   <xsl:template match="simplesect" mode="function-clauses">
     <xsl:if test="@kind='pre'">