diff --git a/build.c b/build.c
index 383a5bb..83390ec 100644
--- a/build.c
+++ b/build.c
@@ -274,7 +274,7 @@ static int buildForTarget(const char * arg, BTA_t ba,
     }
 #undef	_anyarch
 
-    char *br_build = rpmExpand("%{?_buildrequires_build}", 0);
+    char *br_build = rpmExpand("%{?_buildrequires_build}", NULL);
     if (spec->packages && br_build && *br_build) {
 	if (parseRCPOT (spec, spec->packages, br_build, RPMTAG_BUILDREQUIRES, 0, RPMSENSE_SCRIPT_BUILD)) {
 	    rc = 1;
diff --git a/build/files.c b/build/files.c
index 4e75daa..c71586a 100644
--- a/build/files.c
+++ b/build/files.c
@@ -2757,7 +2757,7 @@ static int generateDepends(Spec spec, Package pkg, TFI_t cpioList, int multiLib)
 
 	Fclose(xfd);
 
-	runCmd = rpmExpand( "%{?___build_cmd}", " ", runScript, 0 );
+	runCmd = rpmExpand("%{?___build_cmd}", " ", runScript, NULL);
 
 	poptParseArgvString(runCmd, &argc, &argv);
 
@@ -3017,7 +3017,7 @@ static int checkFiles(Spec spec, StringBuf fileList, int fileListLen)
 
     Fclose(xfd);
 
-    runCmd = rpmExpand( "%{?___build_cmd}", " ", runScript, 0 );
+    runCmd = rpmExpand("%{?___build_cmd}", " ", runScript, NULL);
 
     if (!((rc = poptParseArgvString(runCmd, &ac, (const char ***)&av)) == 0
           && ac > 0 && av != NULL))
diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
index 0b56439..e7f20aa 100644
--- a/rpmio/rpmmacro.h
+++ b/rpmio/rpmmacro.h
@@ -172,6 +172,7 @@ int	isCompressed	(const char * file,
  * @return		macro expansion (malloc'ed)
  */
 char * rpmExpand	(/*@null@*/ const char * arg, ...)
+	__attribute__ ((sentinel))
 	/*@globals rpmGlobalMacroContext @*/
 	/*@modifies rpmGlobalMacroContext @*/;
 
@@ -190,6 +191,7 @@ char * rpmExpand	(/*@null@*/ const char * arg, ...)
  */
 /*@-redecl@*/ /* LCL: shrug */
 const char * rpmGetPath	(/*@null@*/ const char * path, ...)
+	__attribute__ ((sentinel))
 	/*@globals rpmGlobalMacroContext @*/
 	/*@modifies rpmGlobalMacroContext @*/;
 /*@=redecl@*/