diff --git a/LDP/texi2db/doc/Makefile b/LDP/texi2db/doc/Makefile
new file mode 100644
index 00000000..455d3142
--- /dev/null
+++ b/LDP/texi2db/doc/Makefile
@@ -0,0 +1,36 @@
+MAN_DIR = $(DESTDIR)/usr/share/man/man1
+DOC_DIR = /usr/share/doc/texi2db
+
+INSTALLDIR = install -d
+INSTALLDOC = install -p -m 644
+
+all:	build
+
+build:	man html
+
+man:	texi2db.1
+
+html:	texi2db.html
+
+texi2db.1:	texi2db.pod
+	pod2man texi2db.pod texi2db.1
+
+texi2db.html:	texi2db.pod
+	pod2html --title="texi2db" texi2db.pod > texi2db.html
+
+install:	all
+	$(INSTALLDIR) $(MAN_DIR)
+	$(INSTALLDOC) texi2db.1 $(MAN_DIR)/texi2db.1
+	$(INSTALLDIR) $(DOC_DIR)
+	$(INSTALLDOC) texi2db.html $(DOC_DIR)/texi2db.html
+
+# Publishes the documentation on the official LDP homepage for texi2db.
+# You *do* have to enter the password to publish it.
+publish: html
+	scp texi2db.html dmerrill@login.ibiblio.org:/export/sunsite/users/dmerrill/LDP/texi2db/index.html
+
+clean:
+	rm -f texi2db.1
+	rm -f texi2db.html
+	rm -f pod2htmd.x~~
+	rm -f pod2htmi.x~~
diff --git a/LDP/texi2db/doc/texi2db.pod b/LDP/texi2db/doc/texi2db.pod
index 27361572..34d85f3d 100644
--- a/LDP/texi2db/doc/texi2db.pod
+++ b/LDP/texi2db/doc/texi2db.pod
@@ -36,12 +36,14 @@ B<-V>, B<--version> show the program version and exit.
 
 =head1 BUGS
 
-Bugs are tracked in the SourceForge project page at:
+Bugs are tracked along with Lampadas bugs in the Gnome Bugzilla
+repository.
+If you report a bug in B<texi2db>, specify lampadas as the product
+and texi2db as the component, so it will be routed the appropriate person.
+You can do this quickly by visiting the following URL:
 
-http://www.sourceforge.net/projects/linuxdoc
+http://bugzilla.gnome.org/enter_bug.cgi?product=lampadas&component=texi2db
 
-If you report a bug in B<texi2db>, specify texi2db as the category so it will
-be routed the appropriate person.
 
 =head1 NOTES