@@ -, +, @@ 
---
 build/files.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
--- a/build/files.c	
+++ a/build/files.c	
@@ -1144,14 +1144,12 @@ static void genCpioListAndHeader(Spec spec, /*@partial@*/ FileList fl,
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILERDEVS, RPM_INT16_TYPE,
 			       &(flp->fl_rdev), 1);
       }
-      if (sizeof(flp->fl_dev) != sizeof(uint_32)) {
-	uint_32 pdevice = (uint_32)flp->fl_dev;
+      {
+	uint_32 pdevice = flp->fl_dev ? 1 : 0;
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEDEVICES, RPM_INT32_TYPE,
 			       &(pdevice), 1);
-      } else {
-	(void) headerAddOrAppendEntry(h, RPMTAG_FILEDEVICES, RPM_INT32_TYPE,
-			       &(flp->fl_dev), 1);
       }
+
       if (sizeof(flp->fl_ino) != sizeof(uint_32)) {
 	uint_32 ino = (uint_32)flp->fl_ino;
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEINODES, RPM_INT32_TYPE,
--