diff --git a/Makefile.in b/Makefile.in
index 0acfec814..840c75803 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,7 @@ sysconfdir = @sysconfdir@
 libexecdir = @libexecdir@
 includedir = @includedir@
 datarootdir = @datarootdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 docdir = @docdir@
 mandir = @mandir@
@@ -138,6 +139,7 @@ package: sudo.pp
 	    includedir=$(includedir) \
 	    timedir=$(timedir) \
 	    mandir=$(mandir) \
+	    localedir=$(localedir) \
 	    docdir=$(docdir) \
 	    sysconfdir=$(sysconfdir) \
 	    sudoersdir=$(sudoersdir) \
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 69c6f166e..592960cd9 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -284,7 +284,7 @@ install-nls:
 	fi; \
 	set -- $(LINGUAS); \
 	while test $$# != 0; do \
-	    $(INSTALL) -d $(DESTDIR)$(localedir)/$$1/LC_MESSAGES; \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$1/LC_MESSAGES; \
 	    $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0644 $(srcdir)/po/$$1.mo $(DESTDIR)$(localedir)/$$1/LC_MESSAGES/sudoers.mo; \
 	    shift; \
 	done; \
diff --git a/src/Makefile.in b/src/Makefile.in
index 601876041..431d158c3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -170,7 +170,7 @@ install-nls:
 	fi; \
 	set -- $(LINGUAS); \
 	while test $$# != 0; do \
-	    $(INSTALL) -d $(DESTDIR)$(localedir)/$$1/LC_MESSAGES; \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$1/LC_MESSAGES; \
 	    $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0644 $(srcdir)/po/$$1.mo $(DESTDIR)$(localedir)/$$1/LC_MESSAGES/sudo.mo; \
 	    shift; \
 	done; \
diff --git a/sudo.pp b/sudo.pp
index 6b9cd9268..a755651e7 100644
--- a/sudo.pp
+++ b/sudo.pp
@@ -187,6 +187,8 @@ still allow people to get their work done."
 	$timedir/		0700 root:
 	$docdir/
 	$docdir/*
+	$localedir/		optional
+	$localedir/**		optional
 	/etc/pam.d/*		volatile,optional
 %if [rpm,deb]
 	$sudoersdir/sudoers $sudoers_mode $sudoers_uid:$sudoers_gid volatile