Index: cnf/make.globals
===================================================================
--- cnf/make.globals	(revision 6069)
+++ cnf/make.globals	(working copy)
@@ -54,7 +54,7 @@
 # Number of seconds rsync will wait before timing out.
 #RSYNC_TIMEOUT="180"
 
-PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-*"
+PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-* --prune-empty-dirs"
 
 # Minimal CONFIG_PROTECT
 CONFIG_PROTECT="/etc"
Index: bin/emerge
===================================================================
--- bin/emerge	(revision 6069)
+++ bin/emerge	(working copy)
@@ -3738,7 +3738,8 @@
 				"--exclude=/distfiles",   # Exclude distfiles from consideration
 				"--exclude=/local",       # Exclude local     from consideration
 				"--exclude=/packages",    # Exclude packages  from consideration
-				"--filter=H_**/files/digest-*" # Exclude manifest1 digests and delete on the receiving side
+				"--filter=H_**/files/digest-*", # Exclude manifest1 digests and delete on the receiving side
+				"--prune-empty-dirs"      # Prune empty ${FILESDIR} when manifest1 digests are excluded
 			])
 
 		else: