diff --git a/cf/Makefile.am.common b/cf/Makefile.am.common
index 9b4f7e86e..cd1b2dd7b 100644
--- a/cf/Makefile.am.common
+++ b/cf/Makefile.am.common
@@ -81,14 +81,6 @@ install-build-headers:: $(include_HEADERS) $(build_HEADERZ)
 
 all-local: install-build-headers
 
-cat1dir = $(mandir)/cat1
-cat3dir = $(mandir)/cat3
-cat5dir = $(mandir)/cat5
-cat8dir = $(mandir)/cat8
-
-MANRX = \(.*\)\.\([0-9]\)
-CATSUFFIX = @CATSUFFIX@
-
 SUFFIXES += .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
 
 NROFF_MAN = groff -mandoc -Tascii
@@ -159,85 +151,89 @@ dist-cat8-mans:
 dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans
 
 install-cat1-mans:
-	@ext=1;\
+	@section=1;\
+	catdir="$(DESTDIR)/$(mandir)/cat$$section"; \
 	foo='$(man1_MANS)'; \
 	bar='$(man_MANS)'; \
 	for i in $$bar; do \
 	case $$i in \
-	*.1) foo="$$foo $$i";; \
+	*.$$section) foo="$$foo $$i";; \
 	esac; done; \
 	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat1dir); \
+		$(mkinstalldirs) $$catdir; \
 		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat1/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat1dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat1dir)/$$b.$(CATSUFFIX);\
+			f=`echo $$x | sed 's/\.[^.]*$$//'`; \
+			g="$$f.cat$$section"; \
+			if test -f "$(srcdir)/$$g"; then \
+				echo "$(INSTALL_DATA) $(srcdir)/$$g $$catdir/$$f.$(CATSUFFIX)";\
+				$(INSTALL_DATA) $(srcdir)/$$g $$catdir/$$f.$(CATSUFFIX);\
 			 fi; \
 		done ;\
 	fi
 
 install-cat3-mans:
-	@ext=3;\
-	foo='$(man3_MANS)'; \
+	@section=3;\
+	catdir="$(DESTDIR)/$(mandir)/cat$$section"; \
+	foo='$(man1_MANS)'; \
 	bar='$(man_MANS)'; \
 	for i in $$bar; do \
 	case $$i in \
-	*.3) foo="$$foo $$i";; \
+	*.$$section) foo="$$foo $$i";; \
 	esac; done; \
 	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat3dir); \
+		$(mkinstalldirs) $$catdir; \
 		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat3/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat3dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat3dir)/$$b.$(CATSUFFIX);\
+			f=`echo $$x | sed 's/\.[^.]*$$//'`; \
+			g="$$f.cat$$section"; \
+			if test -f "$(srcdir)/$$g"; then \
+				echo "$(INSTALL_DATA) $(srcdir)/$$g $$catdir/$$f.$(CATSUFFIX)";\
+				$(INSTALL_DATA) $(srcdir)/$$g $$catdir/$$f.$(CATSUFFIX);\
 			 fi; \
 		done ;\
 	fi
-	
+
 install-cat5-mans:
-	@ext=5;\
-	foo='$(man5_MANS)'; \
+	@section=5;\
+	catdir="$(DESTDIR)/$(mandir)/cat$$section"; \
+	foo='$(man1_MANS)'; \
 	bar='$(man_MANS)'; \
 	for i in $$bar; do \
 	case $$i in \
-	*.5) foo="$$foo $$i";; \
+	*.$$section) foo="$$foo $$i";; \
 	esac; done; \
 	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat5dir); \
+		$(mkinstalldirs) $$catdir; \
 		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat5/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat5dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat5dir)/$$b.$(CATSUFFIX);\
+			f=`echo $$x | sed 's/\.[^.]*$$//'`; \
+			g="$$f.cat$$section"; \
+			if test -f "$(srcdir)/$$g"; then \
+				echo "$(INSTALL_DATA) $(srcdir)/$$g $$catdir/$$f.$(CATSUFFIX)";\
+				$(INSTALL_DATA) $(srcdir)/$$g $$catdir/$$f.$(CATSUFFIX);\
 			 fi; \
 		done ;\
 	fi
-	
+
 install-cat8-mans:
-	@ext=8;\
-	foo='$(man8_MANS)'; \
+	@section=8;\
+	catdir="$(DESTDIR)/$(mandir)/cat$$section"; \
+	foo='$(man1_MANS)'; \
 	bar='$(man_MANS)'; \
 	for i in $$bar; do \
 	case $$i in \
-	*.8) foo="$$foo $$i";; \
+	*.$$section) foo="$$foo $$i";; \
 	esac; done; \
 	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat8dir); \
+		$(mkinstalldirs) $$catdir; \
 		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat8/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat8dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat8dir)/$$b.$(CATSUFFIX);\
+			f=`echo $$x | sed 's/\.[^.]*$$//'`; \
+			g="$$f.cat$$section"; \
+			if test -f "$(srcdir)/$$g"; then \
+				echo "$(INSTALL_DATA) $(srcdir)/$$g $$catdir/$$f.$(CATSUFFIX)";\
+				$(INSTALL_DATA) $(srcdir)/$$g $$catdir/$$f.$(CATSUFFIX);\
 			 fi; \
 		done ;\
 	fi
-	
+
 
 install-cat-mans: install-cat1-mans install-cat3-mans install-cat5-mans install-cat8-mans