diff --git a/redhat-rpm-config-9.0.3-filtering-macros.patch b/redhat-rpm-config-9.0.3-filtering-macros.patch
index c8102db..bf5e25a 100644
--- a/redhat-rpm-config-9.0.3-filtering-macros.patch
+++ b/redhat-rpm-config-9.0.3-filtering-macros.patch
@@ -1,6 +1,6 @@
 --- redhat-rpm-config-9.0.3/macros.orig	2009-08-07 08:48:50.925412526 -0700
 +++ redhat-rpm-config-9.0.3/macros	2009-08-07 08:55:16.374536719 -0700
-@@ -224,3 +224,37 @@
+@@ -243,3 +243,37 @@ kernel_module_package_release	1
  	fi \
  	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
  )}
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 6a8f5f9..9e8afd3 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
-Summary: Red Hat specific rpm configuration files.
+Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 16%{?dist}
+Release: 17%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -36,6 +36,8 @@ Red Hat specific rpm configuration files.
 %patch8 -p1
 %patch9 -p1
 
+%build
+
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
 
@@ -47,6 +49,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Sep 03 2009 Paul Howarth <paul@city-fan.org> 9.0.3-17
+- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
+- add (empty) %%build section
+- fix unescaped macros in changelog
+
 * Tue Aug 18 2009 Chris Weyl <cweyl@alumni.drew.edu> 9.0.3-16
 - add the filtering framework approved by the FPC/FESCo. (#516240)
 
@@ -156,7 +163,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Added patch for find-requires. Waiting on write access to public CVS.
 
 * Tue Sep 12 2006 Deepak Bhole <dbhole@redhat.com> 8.0.45-6
-- Fix brp-java-repack-jars to work with builddirs that aren't %name-%version
+- Fix brp-java-repack-jars to work with builddirs that aren't %%name-%%version
 
 * Mon Sep 11 2006 Fernando Nasser <fnasser@redhat.com> - 8.0.45-5
 - Fix order of tokens in find command (thanks mikeb@redhat.com)
@@ -300,7 +307,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Remove tracking dependency
 
 * Wed Oct 16 2002 Phil Knirsch <pknirsch@redhat.com> 8.0.3-2
-- Added fix for outdated config.[sub|guess] files in %configure section
+- Added fix for outdated config.[sub|guess] files in %%configure section
 
 * Wed Oct 16 2002 Elliot Lee <sopwith@redhat.com> 8.0.3-1
 - New release that blows up on unpackaged files and missing doc files.
@@ -309,7 +316,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - don't redefine everything in macros, just what we need to
 
 * Mon Sep 16 2002 Alexander Larsson <alexl@redhat.com> 8.0.1
-- Add debug package support to %__spec_install_post
+- Add debug package support to %%__spec_install_post
 
 * Tue Sep  3 2002 Bill Nottingham <notting@redhat.com> 8.0-1
 - bump version