diff --git a/doc/Changelog b/doc/Changelog
index 3d2bb12..f91dc2c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,8 @@ sysvinit (3.05) unreleased; urgency=low
       to the man directory.
     * Added sys/sysmacros.h include in mountpoint.c to fix
       compiler errors on systems where major/minor macros were not defined.
+    * Applied patches from Mark Hindley to clean up man page
+      Makefile, translations and installs of new man pages.
 
 sysvinit (3.04) released; urgency=low
     * Mark Hindley supplied patch to make bootlogd compile
diff --git a/man/Makefile b/man/Makefile
index 5817b96..ceff3e7 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -3,25 +3,26 @@ killall5.8 last.1 lastb.1 logsave.8 mesg.1 mountpoint.1 pidof.8 poweroff.8 \
 readbootlog.1 reboot.8 runlevel.8 shutdown.8 sulogin.8 telinit.8 utmpdump.1 \
 wall.1
 
-LANGUAGES_DIST =`sed -ne 's/^.*\[po4a_langs\] \(.*\)$/\1/p' po/po4a.cfg`
-LANGUAGES=$(LANGUAGES_DIST)
-LANGUAGES=de es fi fr hu id pl
+LANGUAGES=$(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' po/po4a.cfg)
 
-VERSION?=1.2.3
+PO4A := $(shell command -v po4a 2> /dev/null)
+PO4A_OPTS = --previous --srcdir po/ --destdir ./ --no-backups --stamp \
+            --package-name sysvinit --package-version $(VERSION)
 
-PO4A_OPTS = --previous --srcdir po/ --destdir po/ --no-backups \
-            --package-name sysvinit --package-version $(VERSION) \
-            --msgid-bugs-address "Your Bugmail <mail@example.com>"
-
-translated:
-	po4a $(PO4A_OPTS) po/po4a.cfg
-
-all install: translated
+all:
 	sed --in-place=.orig --separate 's/\@VERSION\@/$(VERSION)/g' $(MANPAGES)
+ifdef PO4A
+	po4a $(PO4A_OPTS) po/po4a.cfg
+else
+	@echo 'Install po4a to build translated manpages'
+endif
+
+# Installation recipes are in ../src/Makefile
+install: all
 
 clean distclean:
 	for man in $(MANPAGES) ; do \
 	   if [ -f "$$man.orig" ] ; then mv "$$man.orig" "$$man" ; fi \
-	done  
-	for lang in $(LANGUAGES) ; do rm -rf "po/$$lang" ; done
+	done
+	for lang in $(LANGUAGES) ; do rm -rf "$$lang" "$$lang.po" ; done
 
diff --git a/man/po/sysvinit-man.pot b/man/po/sysvinit-man.pot
index 43a39b8..f9c5ea0 100644
--- a/man/po/sysvinit-man.pot
+++ b/man/po/sysvinit-man.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sysvinit 1.2.3\n"
+"Project-Id-Version: sysvinit 3.05\n"
 "Report-Msgid-Bugs-To: Your Bugmail <mail@example.com>\n"
-"POT-Creation-Date: 2022-05-01 15:59-0300\n"
+"POT-Creation-Date: 2022-05-09 12:43-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Makefile b/src/Makefile
index 1b368dc..865af48 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -214,19 +214,21 @@ install:	all
 		fi
 		$(INSTALL_DIR) $(ROOT)/usr/include/
 		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
-		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
-		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
-		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
-		for man in $(MAN1); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/; \
+		for lang in  '' $(subst ../man/,,$(wildcard ../man/po/??/)); do \
+			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/$$lang; \
+			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/$$lang; \
+			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/$$lang; \
+		done
+		for man in $(MAN1) $(subst ../man/,,$(foreach man,$(MAN1),$(wildcard ../man/??/$(man)))); do \
+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/$$man; \
 			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man1/$$man ; \
 		done
-		for man in $(MAN5); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/; \
+		for man in $(MAN5) $(subst ../man/,,$(foreach man,$(MAN5),$(wildcard ../man/??/$(man)))); do \
+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/$$man; \
 			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \
 		done
-		for man in $(MAN8); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/; \
+		for man in $(MAN8) $(subst ../man/,,$(foreach man,$(MAN8),$(wildcard ../man/??/$(man)))); do \
+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/$$man; \
 			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \
 		done
 ifeq ($(ROOT),)