diff --git a/rpm-python.spec b/rpm-python.spec
index 758c231..c6221d1 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -16,7 +16,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        169
+Release:        181
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
@@ -59,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_libdir}/python*
+
 %changelog
 * Fri May 25 2007 - mls@suse.de
 - fix unicode queries
diff --git a/rpm-shorten-changelog.diff b/rpm-shorten-changelog.diff
new file mode 100644
index 0000000..de663d2
--- /dev/null
+++ b/rpm-shorten-changelog.diff
@@ -0,0 +1,52 @@
+--- build/parseChangelog.c
++++ build/parseChangelog.c
+@@ -111,10 +111,11 @@ static int dateToTimet(const char * datestr, /*@out@*/ time_t * secs)
+ static int addChangelog(Header h, StringBuf sb)
+ 	/*@modifies h @*/
+ {
+-    char *s;
++    char *s, *p;
+     int i;
+     time_t time;
+     time_t lastTime = 0;
++    time_t cutOffTime = 1151704800; /* date -d "2006/07/01" +%s #SLES10-GA  */
+     char *date, *name, *text, *next;
+ 
+     s = getStringBuf(sb);
+@@ -167,6 +168,12 @@ static int addChangelog(Header h, StringBuf sb)
+ 	    return RPMERR_BADSPEC;
+ 	}
+ 
++        /* workaround old suse oddity */
++        if (*s == '-') {
++            ++s;
++            SKIPSPACE(s);
++        }
++
+ 	/* name */
+ 	name = s;
+ 	while (*s != '\0') s++;
+@@ -178,6 +185,13 @@ static int addChangelog(Header h, StringBuf sb)
+ 	    return RPMERR_BADSPEC;
+ 	}
+ 
++        /* remove domain part of the email address */
++        p = strstr(name, "@suse");
++        if (!p)
++            p = strstr(name, "@novell");
++        if (p)
++            *p = '\0';
++
+ 	/* text */
+ 	SKIPSPACE(text);
+ 	if (! *text) {
+@@ -198,7 +212,8 @@ static int addChangelog(Header h, StringBuf sb)
+ 	    *s-- = '\0';
+ 	}
+ 	
+-	addChangelogEntry(h, time, name, text);
++        if (time >= cutOffTime)
++            addChangelogEntry(h, time, name, text);
+ 	s = next;
+     }
+ 
diff --git a/rpm.changes b/rpm.changes
index 3bbc6be..06d3c5b 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 16 20:46:42 CET 2007 - dmueller@suse.de
+
+- shorten changelogs in binary rpms (#308569) 
+  * saves 4.3MB for the one CD media 
+
 -------------------------------------------------------------------
 Thu Oct 11 13:37:16 CEST 2007 - schwab@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 296273a..fee9026 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        143
+Release:        148
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -127,6 +127,7 @@ Patch98:        showtransscripts.diff
 Patch99:        rpm-debugedit-shared.diff
 Patch100:       rpm-gcc43.diff
 Patch101:       lzma.diff
+Patch102:       rpm-shorten-changelog.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 
@@ -197,7 +198,7 @@ rm -f rpmdb/db.h
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89
 %patch -P 90 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99
-%patch -P 100 -P 101
+%patch -P 100 -P 101 -P 102
 chmod 755 scripts/find-supplements{,.ksyms}
 chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 tar -xjvf %{SOURCE1}
@@ -341,10 +342,10 @@ fi
 
 %package -n popt
 Summary:        A C library for parsing command line parameters
-License:        LGPL v2 or later
+License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        371
+Release:        376
 #
 
 %description -n popt
@@ -364,10 +365,10 @@ Authors:
 
 %package -n popt-devel
 Summary:        C Library for Parsing Command Line Parameters
-License:        LGPL v2 or later
+License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        371
+Release:        376
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -400,7 +401,11 @@ Authors:
 	/usr/include/popt.h
         /%{_lib}/libpopt.so
 %doc	%{_mandir}/man3/popt.3*
+
 %changelog
+* Fri Nov 16 2007 - dmueller@suse.de
+- shorten changelogs in binary rpms (#308569)
+  * saves 4.3MB for the one CD media
 * Thu Oct 11 2007 - schwab@suse.de
 - Add support for lzma compressed archives.
 * Sun Sep 30 2007 - rguenther@suse.de