diff --git a/srcpkgs/tdb/patches/tdb-utils-linking-order.patch b/srcpkgs/tdb/patches/tdb-utils-linking-order.patch
new file mode 100644
index 0000000000..0064ed996d
--- /dev/null
+++ b/srcpkgs/tdb/patches/tdb-utils-linking-order.patch
@@ -0,0 +1,22 @@
+--- tdb.mk.orig	2011-11-16 14:59:11.561978836 +0100
++++ tdb.mk	2011-11-16 15:01:20.037847681 +0100
+@@ -15,16 +15,16 @@ bin/tdbtest$(EXEEXT): tools/tdbtest.o $(
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm $(TDB_DEPS)
+ 
+ bin/tdbtool$(EXEEXT): tools/tdbtool.o $(TDB_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb $(TDB_DEPS)
++	$(CC) $(CFLAGS) $(LDFLAGS) tools/tdbtool.o $(TDB_DEPS) $(TDB_SOLIB) -o bin/tdbtool
+ 
+ bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb $(TDB_DEPS)
+ 
+ bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb $(TDB_DEPS)
++	$(CC) $(CFLAGS) $(LDFLAGS) tools/tdbdump.o $(TDB_DEPS) $(TDB_SOLIB) -o bin/tdbdump
+ 
+ bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb $(TDB_DEPS)
++	$(CC) $(CFLAGS) $(LDFLAGS) tools/tdbbackup.o $(TDB_DEPS) $(TDB_SOLIB) -o bin/tdbbackup
+ 
+ test:: abi_checks
+ 
diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template
index 9fac21092c..42cd32947d 100644
--- a/srcpkgs/tdb/template
+++ b/srcpkgs/tdb/template
@@ -14,19 +14,17 @@ long_desc="
 
 subpackages="libtdb tdb-devel tdb-python"
 
-
 Add_dependency build pkg-config
 Add_dependency build automake
 Add_dependency build python-devel
 Add_dependency build libxslt
+Add_dependency build docbook-xsl
 
-pre_configure()
-{
-	cd ${wrksrc} && ./autogen.sh
+pre_configure() {
+	./autogen.sh
 }
 
-post_install()
-{
+post_install() {
 	# _PUBLIC_ is only defined internally!
 	sed -i -e "s|_PUBLIC_ ||g" ${DESTDIR}/usr/include/tdb.h
 }