diff -ru portage-utils.orig/libq/atom_explode.c portage-utils/libq/atom_explode.c
--- portage-utils.orig/libq/atom_explode.c	2009-07-28 15:42:28.416144063 +0100
+++ portage-utils/libq/atom_explode.c	2009-07-28 16:15:17.405946463 +0100
@@ -91,8 +91,7 @@
 			if (ptr[0] == 'r' && ptr[-1] == '-') {
 				ret->PR_int = atoi(ptr + 1);
 				ptr[-1] = '\0';
-			} else
-				strcat(ret->PVR, "-r0");
+			}
 			break;
 		}
 		--ptr;
diff -ru portage-utils.orig/qpkg.c portage-utils/qpkg.c
--- portage-utils.orig/qpkg.c	2009-07-28 15:42:28.419476633 +0100
+++ portage-utils/qpkg.c	2009-07-28 16:15:17.412613202 +0100
@@ -206,11 +206,11 @@
 	struct stat st;
 
 	if (pretend) {
-		printf(" %s-%s %s/%s:\n", GREEN, NORM, atom->CATEGORY, atom->P);
+		printf(" %s-%s %s/%s:\n", GREEN, NORM, atom->CATEGORY, atom->PVR);
 		return 0;
 	}
 
-	snprintf(buf, sizeof(buf), "%s/%s/%s/CONTENTS", portvdb, atom->CATEGORY, atom->P);
+	snprintf(buf, sizeof(buf), "%s/%s/%s/CONTENTS", portvdb, atom->CATEGORY, atom->PVR);
 	if ((fp = fopen(buf, "r")) == NULL)
 		return -1;
 
@@ -245,7 +245,7 @@
 	fclose(out);
 	fclose(fp);
 
-	printf(" %s-%s %s/%s: ", GREEN, NORM, atom->CATEGORY, atom->P);
+	printf(" %s-%s %s/%s: ", GREEN, NORM, atom->CATEGORY, atom->PVR);
 	fflush(stdout);
 
 	snprintf(tbz2, sizeof(tbz2), "%s/bin.tar.bz2", tmpdir);
@@ -255,7 +255,7 @@
 	pclose(fp);
 
 	snprintf(xpak, sizeof(xpak), "%s/inf.xpak", tmpdir);
-	snprintf(buf, sizeof(buf), "%s/%s/%s", portvdb, atom->CATEGORY, atom->P);
+	snprintf(buf, sizeof(buf), "%s/%s/%s", portvdb, atom->CATEGORY, atom->PVR);
 	xpak_argv[0] = buf;
 	xpak_argv[1] = NULL;
 	xpak_create(xpak, 1, xpak_argv);
@@ -267,7 +267,7 @@
 	unlink(xpak);
 	unlink(tbz2);
 
-	snprintf(tbz2, sizeof(tbz2), "%s/%s.tbz2", qpkg_get_bindir(), atom->P);
+	snprintf(tbz2, sizeof(tbz2), "%s/%s.tbz2", qpkg_get_bindir(), atom->PVR);
 	if (rename(buf, tbz2)) {
 		warnp("could not move '%s' to '%s'", buf, tbz2);
 		return 1;