diff --git a/Makefile.am b/Makefile.am
index 7c5c913..121fa98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,9 +95,12 @@ appman_PRE = \
 
 FSERRORS = /var/log/xfs.log
 
+cataloguedir = $(sysconfdir)/X11/fontpath.d
+catalogue_DATA = # XXX, empty so that the dir is created
+
 FONTDIR = $(libdir)/X11/fonts
 
-FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
+FONTPATH = catalogue:$(cataloguedir)/,$(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
 
 config: config.cpp
 	sed -e s/XCOMM/\#/ -e s@DEFAULTFONTPATH@$(FONTPATH)@ -e s@FSERRORS@$(FSERRORS)@ < $(top_srcdir)/config.cpp > config
@@ -128,6 +131,7 @@ MAN_SUBSTS = \
 	-e 's|__projectroot__|$(prefix)|g' \
 	-e 's|__apploaddir__|$(appdefaultdir)|' \
 	-e 's|__configdir__|$(configdir)|' \
+	-e 's|__cataloguedir__|$(cataloguedir)|g' \
 	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
 	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \