diff --git a/libguac/doc/docbook.xslt b/libguac/doc/docbook.xslt
index f8ffd0e3..7df2e642 100644
--- a/libguac/doc/docbook.xslt
+++ b/libguac/doc/docbook.xslt
@@ -2,17 +2,17 @@
 
 <!-- Stylesheet for transforming Doxygen output to DocBook 5.0 -->
 <xsl:stylesheet
+    xmlns="http://docbook.org/ns/docbook"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:exsl="http://exslt.org/common"
     extension-element-prefixes="exsl"
     version="1.0">
 
-    <xsl:output method="xml" indent="yes"
-        doctype-public="-//OASIS//DTD DocBook V5.0//EN"
-        doctype-system="http://docbook.org/xml/5.0/dtd/docbook.dtd"/>
+    <xsl:output method="xml" indent="yes"/>
 
     <xsl:template match="/doxygen">
-        <reference>
+        <reference version="5.0" xml:lang="en">
+            <title>libguac</title>
             <xsl:apply-templates select="//memberdef[@kind='function']"/>
         </reference>
     </xsl:template>
@@ -21,7 +21,8 @@
 
         <xsl:variable name="name" select="name"/>
 
-        <refentry id="{$name}">
+        <!-- Previously had  xml:id="{$name}" -->
+        <refentry>
 
             <indexterm>
                 <primary><xsl:value-of select="name"/></primary>
@@ -31,6 +32,13 @@
                 <refentrytitle><xsl:value-of select="name"/></refentrytitle>
             </refmeta>
 
+            <refnamediv>
+                <refname><xsl:value-of select="name"/></refname>
+                <refpurpose>
+                    <xsl:value-of select="briefdescription/para"/>
+                </refpurpose>
+            </refnamediv>
+
             <refsynopsisdiv>
                 <funcsynopsis>
                     <funcprototype>
@@ -45,54 +53,61 @@
                             <paramdef>
                                 <xsl:value-of select="type"/>
                                 <xsl:if test="declname">
+                                    <xsl:text> </xsl:text>
                                     <parameter>
                                         <xsl:value-of select="declname"/>
                                     </parameter>
                                 </xsl:if>
                             </paramdef>
                         </xsl:for-each>
+                        <xsl:if test="not(param)">
+                            <void/>
+                        </xsl:if>
                     </funcprototype>
                 </funcsynopsis>
             </refsynopsisdiv>
 
-            <refnamediv>
-                <refname><xsl:value-of select="name"/></refname>
-                <refpurpose>
-                    <xsl:value-of select="briefdescription/para"/>
-                </refpurpose>
-            </refnamediv>
-
             <refsection>
                 <title>Description</title>
                 <para>
                     <xsl:value-of select="briefdescription/para"/>
-                    <xsl:for-each select="detaileddescription/para[not(parameterlist)]">
-                        <xsl:value-of select="."/>
-                    </xsl:for-each>
                 </para>
+                <xsl:for-each select="detaileddescription/para[not(parameterlist|simplesect)]">
+                    <para><xsl:value-of select="."/></para>
+                </xsl:for-each>
             </refsection>
 
-            <refsection>
-                <title>Parameters</title>
+            <xsl:if test=".//parameterlist/parameteritem">
+                <refsection>
+                    <title>Parameters</title>
 
-                <variablelist>
-                    <xsl:for-each select=".//parameterlist/parameteritem">
-                        <varlistentry>
-                            <term>
-                                <parameter>
-                                    <xsl:value-of select="parameternamelist/parametername"/>
-                                </parameter>
-                            </term>
-                            <listitem>
-                                <xsl:for-each select="parameterdescription/para">
-                                    <para><xsl:value-of select="."/></para>
-                                </xsl:for-each>
-                            </listitem>
-                        </varlistentry>
-                     </xsl:for-each>
-                 </variablelist>
+                    <variablelist>
+                        <xsl:for-each select=".//parameterlist/parameteritem">
+                            <varlistentry>
+                                <term>
+                                    <parameter>
+                                        <xsl:value-of select="parameternamelist/parametername"/>
+                                    </parameter>
+                                </term>
+                                <listitem>
+                                    <xsl:for-each select="parameterdescription/para">
+                                        <para><xsl:value-of select="."/></para>
+                                    </xsl:for-each>
+                                </listitem>
+                            </varlistentry>
+                        </xsl:for-each>
+                    </variablelist>
+                </refsection>
+            </xsl:if>
 
-            </refsection>
+            <xsl:for-each select="detaileddescription/para/simplesect[@kind='return']">
+                <refsection>
+                    <title>Return Value</title>
+                    <xsl:for-each select="para">
+                        <para><xsl:value-of select="."/></para>
+                    </xsl:for-each>
+                </refsection>
+            </xsl:for-each>
 
 
         </refentry>