diff --git a/client/Makefile.dist b/client/Makefile.dist
index 7855180f..b70b30b1 100644
--- a/client/Makefile.dist
+++ b/client/Makefile.dist
@@ -51,11 +51,11 @@ install: all
 	  $(INSTALL) scripts/$(SCRIPT) $(DESTDIR)$(ETC)/dhclient-script; \
 	  $(CHMOD) 700 $(DESTDIR)$(ETC)/dhclient-script; \
 	fi
-	$(MANINSTALL) $(MANFROM) dhclient.cat8 $(MANTO) \
+	$(MANINSTALL) $(MANFROM) dhclient.$(MANCAT)8 $(MANTO) \
 			$(DESTDIR)$(ADMMANDIR)/dhclient$(ADMMANEXT)
-	$(MANINSTALL) $(MANFROM) dhclient-script.cat8 $(MANTO) \
+	$(MANINSTALL) $(MANFROM) dhclient-script.$(MANCAT)8 $(MANTO) \
 			$(DESTDIR)$(ADMMANDIR)/dhclient-script$(ADMMANEXT)
-	$(MANINSTALL) $(MANFROM) dhclient.conf.cat5 $(MANTO) \
+	$(MANINSTALL) $(MANFROM) dhclient.conf.$(MANCAT)5 $(MANTO) \
 			$(DESTDIR)$(FFMANDIR)/dhclient.conf$(FFMANEXT)
 	$(MANINSTALL) $(MANFROM) dhclient.leases.cat5 $(MANTO) \
 			$(DESTDIR)$(FFMANDIR)/dhclient.leases$(FFMANEXT)
diff --git a/common/Makefile.dist b/common/Makefile.dist
index a9d71aba..7b89176d 100644
--- a/common/Makefile.dist
+++ b/common/Makefile.dist
@@ -50,8 +50,12 @@ install: all
 	    fi; \
 	  done; \
 	done
-	$(MANINSTALL) $(MANFROM) dhcp-options.cat5 $(MANTO) \
+	$(MANINSTALL) $(MANFROM) dhcp-options.$(MANCAT)5 $(MANTO) \
 				$(DESTDIR)$(FFMANDIR)/dhcp-options$(FFMANEXT)
+	$(MANINSTALL) $(MANFROM) dhcp-eval.$(MANCAT)5 $(MANTO) \
+				$(DESTDIR)$(FFMANDIR)/dhcp-eval$(FFMANEXT)
+	$(MANINSTALL) $(MANFROM) dhcp-contrib.$(MANCAT)5 $(MANTO) \
+				$(DESTDIR)$(FFMANDIR)/dhcp-contrib$(FFMANEXT)
 
 depend:
 	makedepend $(INCLUDES) $(PREDEFINES) $(SRCS)
diff --git a/relay/Makefile.dist b/relay/Makefile.dist
index de2e1be7..e5e393e9 100644
--- a/relay/Makefile.dist
+++ b/relay/Makefile.dist
@@ -43,7 +43,7 @@ install: all
 	done
 	$(INSTALL) dhcrelay $(DESTDIR)$(BINDIR)
 	$(CHMOD) 755 $(DESTDIR)$(BINDIR)/dhcrelay
-	$(MANINSTALL) $(MANFROM) dhcrelay.cat8 $(MANTO) \
+	$(MANINSTALL) $(MANFROM) dhcrelay.$(MANCAT)8 $(MANTO) \
 				$(DESTDIR)$(ADMMANDIR)/dhcrelay$(ADMMANEXT)
 
 depend:
diff --git a/server/Makefile.dist b/server/Makefile.dist
index 84760a3a..6bdaf333 100644
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -43,11 +43,11 @@ install: all
 	done
 	$(INSTALL) dhcpd $(DESTDIR)$(BINDIR)
 	$(CHMOD) 755 $(DESTDIR)$(BINDIR)/dhcpd
-	$(MANINSTALL) $(MANFROM) dhcpd.cat8 $(MANTO) \
+	$(MANINSTALL) $(MANFROM) dhcpd.$(MANCAT)8 $(MANTO) \
 			$(DESTDIR)$(ADMMANDIR)/dhcpd$(ADMMANEXT)
-	$(MANINSTALL) $(MANFROM) dhcpd.conf.cat5 $(MANTO) \
+	$(MANINSTALL) $(MANFROM) dhcpd.conf.$(MANCAT)5 $(MANTO) \
 			$(DESTDIR)$(FFMANDIR)/dhcpd.conf$(FFMANEXT)
-	$(MANINSTALL) $(MANFROM) dhcpd.leases.cat5 $(MANTO) \
+	$(MANINSTALL) $(MANFROM) dhcpd.leases.$(MANCAT)5 $(MANTO) \
 			$(DESTDIR)$(FFMANDIR)/dhcpd.leases$(FFMANEXT)
 
 depend: