diff --git a/lib/transaction.c b/lib/transaction.c
index 74ecc4970..80e7e3d2c 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -508,6 +508,10 @@ assert(otherFi != NULL);
 		}
 	    }
 
+	    /* Skipped files dont need fixup size or backups, %config or not */
+	    if (XFA_SKIPPING(rpmfsGetAction(fs, i)))
+		break;
+
 	    /* Try to get the disk accounting correct even if a conflict. */
 	    fixupSize = rpmfiFSizeIndex(otherFi, otherFileNum);
 
diff --git a/tests/rpmconfig.at b/tests/rpmconfig.at
index 15bdbf494..12728a5b8 100644
--- a/tests/rpmconfig.at
+++ b/tests/rpmconfig.at
@@ -542,7 +542,6 @@ AT_CLEANUP
 # Shared config(noreplace) variants of the more interesting cases
 # ------------------------------
 # Upgrade package with locally modified config file, changed in pkg.
-# Creating *two* backups makes no sense, but that's what currently happens.
 AT_SETUP([upgrade changing, modified shared config(noreplace) 1])
 AT_KEYWORDS([install])
 AT_CHECK([
@@ -581,8 +580,7 @@ otherstuff
 otherstuff
 foo-2.0
 ],
-[warning: /etc/my.conf created as /etc/my.conf.rpmnew
-warning: /etc/my.conf created as /etc/my.conf.rpmnew]
+[warning: /etc/my.conf created as /etc/my.conf.rpmnew]
 )
 AT_CLEANUP