diff --git a/baselibs.conf b/baselibs.conf
index 2e87827..e9d7bde 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,2 @@
 popt
+rpm
diff --git a/rpm-python.spec b/rpm-python.spec
index 8f43ecf..803f11c 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -24,7 +24,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2.3
-Release:        19
+Release:        20
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
diff --git a/rpm-suse_macros b/rpm-suse_macros
index d6b9e42..223bd83 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -367,9 +367,12 @@
 %cflags_profile_feedback -fprofile-use
 
 %suse_install_update_message() \
-    install -D -m 644 %1 %buildroot/var/adm/update-messages/%{name}-%{version}-%{release}-%(basename %1).txt
+    install -D -m 644 %1 %buildroot/var/adm/update-messages/%{name}-%{version}-%{release}-%(basename %1).txt \
+%nil
+
 %suse_install_update_script() \
-     install -D -m 755 %1 %buildroot/var/adm/update-scripts/%{name}-%{version}-%{release}-%(basename %1).txt
+     install -D -m 755 %1 %buildroot/var/adm/update-scripts/%{name}-%{version}-%{release}-%(basename %1).txt \
+%nil
 
 # Template for lang sub-package.
 %lang_package(n:) \
diff --git a/rpm.changes b/rpm.changes
index e2b6962..862c8e2 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  1 12:35:39 CET 2008 - ro@suse.de
+
+- add rpm to baselibs.conf (for net-snmp) 
+- append a "nil" after suse_install_update_script and _message
+
 -------------------------------------------------------------------
 Fri Nov 28 15:15:10 CET 2008 - dmueller@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index e4819b2..30a3e59 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -27,7 +27,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2.3
-Release:        19
+Release:        20
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -330,7 +330,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        467
+Release:        468
 #
 
 %description -n popt
@@ -353,7 +353,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        467
+Release:        468
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -388,6 +388,9 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Mon Dec 01 2008 ro@suse.de
+- add rpm to baselibs.conf (for net-snmp)
+- append a "nil" after suse_install_update_script and _message
 * Fri Nov 28 2008 dmueller@suse.de
 - fix build
 - fix stack based buffer overflow in filelist parsing (bnc#397006)