diff -Naurp rpm-4_0-4.0.4-orig/rpmio/macro.c rpm-4_0-4.0.4/rpmio/macro.c
--- rpm-4_0-4.0.4-orig/rpmio/macro.c	2005-06-29 22:04:46 +0400
+++ rpm-4_0-4.0.4/rpmio/macro.c	2005-09-29 14:36:30 +0400
@@ -1435,23 +1435,10 @@ expandMacro(MacroBuf mb)
 		continue;
 	}
 	
-	if (me == NULL) {	/* leave unknown %... as is */
-#ifndef HACK
-#if DEAD
-		/* XXX hack to skip over empty arg list */
-		if (fn == 1 && *f == '*') {
-			s = se;
-			continue;
-		}
-#endif
-		/* XXX hack to permit non-overloaded %foo to be passed */
-		c = '%';	/* XXX only need to save % */
-		SAVECHAR(mb, c);
-#else
+	if (me == NULL) {	/* bail on unknown %... */
 		rpmError(RPMERR_BADSPEC,
-			_("Macro %%%.*s not found, skipping\n"), fn, f);
-		s = se;
-#endif
+			_("Macro %%%.*s not found\n"), fn, f);
+		rc = 1;
 		continue;
 	}