diff --git a/app-admin/sudo/sudo-1.8.22.ebuild b/app-admin/sudo/sudo-1.8.22-r1.ebuild
similarity index 97%
rename from app-admin/sudo/sudo-1.8.22.ebuild
rename to app-admin/sudo/sudo-1.8.22-r1.ebuild
index b9b8ff18c94b9..c10b8c2221166 100644
--- a/app-admin/sudo/sudo-1.8.22.ebuild
+++ b/app-admin/sudo/sudo-1.8.22-r1.ebuild
@@ -169,12 +169,13 @@ src_install() {
 
 	pamd_mimic system-auth sudo auth account session
 
-	keepdir /var/db/sudo
-	fperms 0700 /var/db/sudo
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
 
 	# Don't install into /var/run as that is a tmpfs most of the time
 	# (bug #504854)
-	rm -rf "${D}"/var/run
+	rm -rf "${ED}"/var/run
 }
 
 pkg_postinst() {
diff --git a/app-admin/sudo/sudo-1.8.23_beta2.ebuild b/app-admin/sudo/sudo-1.8.23_beta2.ebuild
index 81a7dffe12161..eaac5af0379b7 100644
--- a/app-admin/sudo/sudo-1.8.23_beta2.ebuild
+++ b/app-admin/sudo/sudo-1.8.23_beta2.ebuild
@@ -169,12 +169,13 @@ src_install() {
 
 	pamd_mimic system-auth sudo auth account session
 
-	keepdir /var/db/sudo
-	fperms 0700 /var/db/sudo
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
 
 	# Don't install into /var/run as that is a tmpfs most of the time
 	# (bug #504854)
-	rm -rf "${D}"/var/run
+	rm -rf "${ED}"/var/run
 }
 
 pkg_postinst() {
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 8897a7115582c..82d9551bad8b1 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -175,12 +175,13 @@ src_install() {
 
 	pamd_mimic system-auth sudo auth account session
 
-	keepdir /var/db/sudo
-	fperms 0700 /var/db/sudo
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
 
 	# Don't install into /var/run as that is a tmpfs most of the time
 	# (bug #504854)
-	rm -rf "${D}"/var/run
+	rm -rf "${ED}"/var/run
 }
 
 pkg_postinst() {