diff --git a/doc/Makefile b/doc/Makefile
index a9ce45a..0bffda6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,11 +17,11 @@ all : $(DOCS)
 include $(TOP)/Make.conf
 
 manual.pdf : manual.tex $(CHAPTERS) facref.bib $(INCLISTINGS) $(REFMAN)
-	pdflatex manual
+	TEXINPUTS=".:./cfacdbdoc:" pdflatex manual
 	bibtex manual
-	makeindex manual
-	pdflatex manual
-	pdflatex manual
+	TEXINPUTS=".:./cfacdbdoc:" makeindex manual
+	TEXINPUTS=".:./cfacdbdoc:" pdflatex manual
+	TEXINPUTS=".:./cfacdbdoc:" pdflatex manual
 
 $(REFMAN) : $(TOP)/include/cfacdb.h cfacdb-doxy.cfg
 	doxygen cfacdb-doxy.cfg
diff --git a/doc/manual.tex b/doc/manual.tex
index fa4fb12..b965004 100644
--- a/doc/manual.tex
+++ b/doc/manual.tex
@@ -65,7 +65,7 @@
 
 % Doxygen stuff
 \usepackage{ifthen}
-\usepackage{cfacdbdoc/doxygen}
+\usepackage{doxygen}
 \renewcommand{\familydefault}{\sfdefault}
 \newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}