Index: build/parseChangelog.c
===================================================================
--- build/parseChangelog.c.orig
+++ build/parseChangelog.c
@@ -167,6 +167,11 @@ static int addChangelog(Header h, String
 	    return RPMERR_BADSPEC;
 	}
 
+        /* workaround old suse oddity */
+        if (*s == '-' && s[1] == ' ') {
+            s += 2;
+        }
+
 	/* name */
 	name = s;
 	while (*s != '\0') s++;
Index: build/pack.c
===================================================================
--- build/pack.c.orig
+++ build/pack.c
@@ -751,6 +751,65 @@ static int_32 copyTags[] = {
     0
 };
 
+static void
+trimChangelog(Header h)
+{
+    static int oneshot;
+    static int cuttime, minnum, maxnum;
+    int * times;
+    char ** names = 0, ** texts = 0;
+    int i, keep, count = 0;
+
+    if (!oneshot) {
+	char *binarychangelogtrim = rpmExpand("%{?_binarychangelogtrim}", NULL);
+	oneshot = 1;
+        if (binarychangelogtrim && *binarychangelogtrim) {
+	    maxnum = atoi(binarychangelogtrim);
+	    binarychangelogtrim = strchr(binarychangelogtrim, ',');
+	    if (binarychangelogtrim)
+	      binarychangelogtrim++;
+	}
+        if (binarychangelogtrim && *binarychangelogtrim) {
+	    cuttime = atoi(binarychangelogtrim);
+	    binarychangelogtrim = strchr(binarychangelogtrim, ',');
+	    if (binarychangelogtrim)
+	      binarychangelogtrim++;
+	}
+        if (binarychangelogtrim && *binarychangelogtrim) {
+	    minnum = atoi(binarychangelogtrim);
+	    binarychangelogtrim = strchr(binarychangelogtrim, ',');
+	}
+    }
+    if (!cuttime && !minnum && !maxnum) {
+	return;
+    }
+    if (!headerGetEntry(h, RPMTAG_CHANGELOGTIME, NULL, (void **) &times, &count))
+        return;
+    if ((!cuttime || count <= minnum) && (!maxnum || count <= maxnum)) {
+	return;
+    }
+    keep = count;
+    if (maxnum && keep > maxnum)
+        keep = maxnum;
+    if (cuttime) {
+	for (i = 0; i < keep; i++) {
+	    if (i >= minnum && times[i] < cuttime)
+		break;
+	}
+	keep = i;
+    }
+    if (keep >= count)
+	return;
+    headerGetEntry(h, RPMTAG_CHANGELOGNAME, NULL, (void **) &names, &count);
+    headerGetEntry(h, RPMTAG_CHANGELOGTEXT, NULL, (void **) &texts, &count);
+    headerModifyEntry(h, RPMTAG_CHANGELOGTIME, RPM_INT32_TYPE, times, keep);
+    headerModifyEntry(h, RPMTAG_CHANGELOGNAME, RPM_STRING_ARRAY_TYPE, names, keep);
+    headerModifyEntry(h, RPMTAG_CHANGELOGTEXT, RPM_STRING_ARRAY_TYPE, texts, keep);
+    free(names);
+    free(texts);
+}
+
+
 /*@-boundswrite@*/
 int packageBinaries(Spec spec)
 {
@@ -760,6 +819,7 @@ int packageBinaries(Spec spec)
     const char *errorString;
     Package pkg;
 
+    trimChangelog(spec->packages->header);
     for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
 	const char *fn;