diff --git a/doc/gtkdoc/project.conf b/doc/gtkdoc/project.conf
index 7a93462..0edabac 100644
--- a/doc/gtkdoc/project.conf
+++ b/doc/gtkdoc/project.conf
@@ -1,2 +1 @@
-subdirs=tmpl
-dist=Makefile,libDatabase-docs.xml
+dist=Makefile,libDatabase-docs.xml,libDatabase-sections.txt,xml/gtkdocentities.ent
diff --git a/doc/gtkdoc/tmpl/Database.sgml b/doc/gtkdoc/tmpl/Database.sgml
deleted file mode 100644
index dfe6787..0000000
--- a/doc/gtkdoc/tmpl/Database.sgml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Database
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/doc/gtkdoc/tmpl/database.sgml b/doc/gtkdoc/tmpl/database.sgml
deleted file mode 100644
index ce344d3..0000000
--- a/doc/gtkdoc/tmpl/database.sgml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-database
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT Database ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### USER_FUNCTION DatabaseCallback ##### -->
-<para>
-
-</para>
-
-@data: 
-@argc: 
-@argv: 
-@columns: 
-@Returns: 
-
-
-<!-- ##### STRUCT DatabaseStatement ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM DatabaseType ##### -->
-<para>
-
-</para>
-
-@DT_NULL: 
-@DT_INTEGER: 
-@DT_TIMESTAMP: 
-@DT_VARCHAR: 
-
-<!-- ##### FUNCTION database_delete ##### -->
-<para>
-
-</para>
-
-@database: 
-
-
-<!-- ##### FUNCTION database_get_last_id ##### -->
-<para>
-
-</para>
-
-@database: 
-@Returns: 
-
-
-<!-- ##### FUNCTION database_new ##### -->
-<para>
-
-</para>
-
-@engine: 
-@config: 
-@section: 
-@Returns: 
-
-
-<!-- ##### FUNCTION database_prepare_delete ##### -->
-<para>
-
-</para>
-
-@database: 
-@statement: 
-
-
-<!-- ##### FUNCTION database_prepare_new ##### -->
-<para>
-
-</para>
-
-@database: 
-@query: 
-@Returns: 
-
-
-<!-- ##### FUNCTION database_prepare_query ##### -->
-<para>
-
-</para>
-
-@database: 
-@statement: 
-@callback: 
-@data: 
-@...: 
-@Returns: 
-
-
-<!-- ##### FUNCTION database_query ##### -->
-<para>
-
-</para>
-
-@database: 
-@query: 
-@callback: 
-@data: 
-@Returns: 
-
-
diff --git a/doc/gtkdoc/tmpl/libDatabase-unused.sgml b/doc/gtkdoc/tmpl/libDatabase-unused.sgml
deleted file mode 100644
index 4ac0086..0000000
--- a/doc/gtkdoc/tmpl/libDatabase-unused.sgml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- ##### STRUCT DatabasePlugin ##### -->
-<para>
-
-</para>
-
-
diff --git a/doc/gtkdoc/tmpl/project.conf b/doc/gtkdoc/tmpl/project.conf
deleted file mode 100644
index 8a1fb1b..0000000
--- a/doc/gtkdoc/tmpl/project.conf
+++ /dev/null
@@ -1 +0,0 @@
-dist=Makefile,Database.sgml,database.sgml,libDatabase-unused.sgml
diff --git a/doc/gtkdoc/xml/gtkdocentities.ent b/doc/gtkdoc/xml/gtkdocentities.ent
new file mode 100644
index 0000000..db0b85f
--- /dev/null
+++ b/doc/gtkdoc/xml/gtkdocentities.ent
@@ -0,0 +1,2 @@
+<!ENTITY server "www.defora.org/doc/gtk-doc/html">
+<!ENTITY title "Reference Manual">
diff --git a/doc/project.conf b/doc/project.conf
index 0cf83f6..c8238d0 100644
--- a/doc/project.conf
+++ b/doc/project.conf
@@ -1,5 +1,5 @@
 subdirs=gtkdoc
-targets=database.1,database.html,database.xml,gtkdoc/libDatabase.types,gtkdoc/tmpl.stamp,gtkdoc/sgml.stamp,gtkdoc/html.stamp
+targets=database.1,database.html,database.xml,gtkdoc/html.stamp,gtkdoc/libDatabase.types,gtkdoc/tmpl.stamp,gtkdoc/xml.stamp
 dist=Makefile,database.css.xml,database.xml.in,docbook.sh,gtkdoc.sh,manual.css.xml
 
 #targets
@@ -25,18 +25,18 @@ type=script
 script=./gtkdoc.sh
 depends=gtkdoc.sh,../config.sh
 
-[gtkdoc/tmpl.stamp]
-type=script
-script=./gtkdoc.sh
-depends=gtkdoc.sh,gtkdoc/libDatabase.types
-
-[gtkdoc/sgml.stamp]
-type=script
-script=./gtkdoc.sh
-depends=gtkdoc.sh,gtkdoc/tmpl.stamp
-
 [gtkdoc/html.stamp]
 type=script
 script=./gtkdoc.sh
-depends=gtkdoc.sh,gtkdoc/libDatabase-docs.xml,gtkdoc/sgml.stamp
+depends=gtkdoc.sh,gtkdoc/libDatabase-docs.xml,$(OBJDIR)gtkdoc/xml.stamp,gtkdoc/xml/gtkdocentities.ent,../config.ent
 install=
+
+[gtkdoc/tmpl.stamp]
+type=script
+script=./gtkdoc.sh
+depends=gtkdoc.sh,$(OBJDIR)gtkdoc/libDatabase.types
+
+[gtkdoc/xml.stamp]
+type=script
+script=./gtkdoc.sh
+depends=gtkdoc.sh,$(OBJDIR)gtkdoc/tmpl.stamp
diff --git a/project.conf b/project.conf
index 8565d98..e406ec5 100644
--- a/project.conf
+++ b/project.conf
@@ -1,6 +1,6 @@
 package=libDatabase
 version=0.0.2
-config=h,sh
+config=ent,h,sh
 
 subdirs=data,doc,include,src,tests,tools
-dist=Makefile,config.h,config.sh
+dist=Makefile,config.ent,config.h,config.sh