diff --git a/redhat-rpm-config-kmp.patch b/redhat-rpm-config-kmp.patch
index a246ec1..b745ee7 100644
--- a/redhat-rpm-config-kmp.patch
+++ b/redhat-rpm-config-kmp.patch
@@ -1,71 +1,71 @@
-diff -urN redhat-rpm-config-8.0.45/macros redhat-rpm-config-8.0.45_orig/macros
---- redhat-rpm-config-8.0.45/macros	2006-10-18 14:11:55.000000000 -0400
-+++ redhat-rpm-config-8.0.45_orig/macros	2005-08-16 20:27:33.000000000 -0400
-@@ -157,67 +156,3 @@
+diff -urN redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
+--- redhat-rpm-config-8.0.45_orig/macros	2005-08-16 20:27:33.000000000 -0400
++++ redhat-rpm-config-8.0.45/macros	2006-10-18 14:11:55.000000000 -0400
+@@ -156,3 +157,67 @@
  
  # Disable lookups
  %_hkp_keyserver  %{nil}
--
--# Use these macros to differentiate between RH and other KMP implementation(s).
--redhat_kernel_module_package	1
--kernel_module_package_release	1
--
--#kernel_module_package [ -n name ] [ -v version ] [ -r release ] [ -s script ]
--#                      [ -f filelist] [ -x ] [ -p preamble ] flavor flavor ...
--
--%kernel_module_package_buildreqs	%global kmodtool_generate_buildreqs 1 \
--					kernel-devel
--
--%kernel_module_package(n:v:r:s:f:xp:) %{expand:%( \
--	%define kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \
--	%define kmp_version %{-v*}%{!-v:%{version}} \
--	%define kmp_release %{-r*}%{!-r:%{release}} \
--	%define latest_kernel %(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel | /usr/lib/rpm/redhat/rpmsort -r | head -n 1` | head -n 1) \
--	%{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
--	%global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \
--	flavors="default" \
--	if [ "i686" == "%{_target_cpu}" ] \
--	then
--		flavors="$flavors smp" \
--	fi
--	if [ "i686" == "%{_target_cpu}" ] || [ "x86_64" == "%{_target_cpu}" ] \
--	then \
--		xenver=$(rpm -q kernel-xen-devel-%{kverrel}|head -n 1)\
--		kdver=$(rpm -q kernel-kdump-devel-%{kverrel}|head -n 1)\
--		if [ "kernel-xen-devel-%{kverrel}" == "$xenver" ] \
--		then \
--			flavors="$flavors xen" \
--		fi \
--		if [ "kernel-kdump-devel-%{kverrel}" == "$kdver" ] \
--		then \
--			flavors="$flavors kdump" \
--		fi \
--	fi \
--	if [ -z "%*" ]; then \
--		flavors_to_build=$flavors \
--	elif [ -z "%{-x}" ]; then \
--		flavors_to_build="%*" \
--	else \
--		flavors_to_build=" $flavors "\
--		echo "[$flavors_to_build]" >/tmp/tmp.txt
--		for i in %* \
--		do \
--			flavors_to_build=${flavors_to_build//$i /}
--		done \
--	fi \
--	echo "%%global flavors_to_build ${flavors_to_build:-%%nil}" \
--	echo "%%global kernel_source() /usr/src/kernels/%kverrel-\\\$([ %%%%{1} = default ] || echo "%%%%{1}-")%_target_cpu" \
--	if [ ! -z "%{-f*}" ] \
--	then \
--		filelist="%{-f*}" \
--	fi \
--	if [ ! -z "%{-p*}" ] \
--	then \
--		preamble="%{-p*}" \
--	fi \
--	if [ -z "%{kmodtool_generate_buildreqs}" ] \
--	then \
--		nobuildreqs="yes" \
--	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 \
--)}
++
++# Use these macros to differentiate between RH and other KMP implementation(s).
++redhat_kernel_module_package	1
++kernel_module_package_release	1
++
++#kernel_module_package [ -n name ] [ -v version ] [ -r release ] [ -s script ]
++#                      [ -f filelist] [ -x ] [ -p preamble ] flavor flavor ...
++
++%kernel_module_package_buildreqs	%global kmodtool_generate_buildreqs 1 \
++					kernel-devel
++
++%kernel_module_package(n:v:r:s:f:xp:) %{expand:%( \
++	%define kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \
++	%define kmp_version %{-v*}%{!-v:%{version}} \
++	%define kmp_release %{-r*}%{!-r:%{release}} \
++	%define latest_kernel %(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel | /usr/lib/rpm/redhat/rpmsort -r | head -n 1` | head -n 1) \
++	%{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
++	%global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \
++	flavors="default" \
++	if [ "i686" == "%{_target_cpu}" ] \
++	then
++		flavors="$flavors smp" \
++	fi
++	if [ "i686" == "%{_target_cpu}" ] || [ "x86_64" == "%{_target_cpu}" ] \
++	then \
++		xenver=$(rpm -q kernel-xen-devel-%{kverrel}|head -n 1)\
++		kdver=$(rpm -q kernel-kdump-devel-%{kverrel}|head -n 1)\
++		if [ "kernel-xen-devel-%{kverrel}" == "$xenver" ] \
++		then \
++			flavors="$flavors xen" \
++		fi \
++		if [ "kernel-kdump-devel-%{kverrel}" == "$kdver" ] \
++		then \
++			flavors="$flavors kdump" \
++		fi \
++	fi \
++	if [ -z "%*" ]; then \
++		flavors_to_build=$flavors \
++	elif [ -z "%{-x}" ]; then \
++		flavors_to_build="%*" \
++	else \
++		flavors_to_build=" $flavors "\
++		echo "[$flavors_to_build]" >/tmp/tmp.txt
++		for i in %* \
++		do \
++			flavors_to_build=${flavors_to_build//$i /}
++		done \
++	fi \
++	echo "%%global flavors_to_build ${flavors_to_build:-%%nil}" \
++	echo "%%global kernel_source() /usr/src/kernels/%kverrel-\\\$([ %%%%{1} = default ] || echo "%%%%{1}-")%_target_cpu" \
++	if [ ! -z "%{-f*}" ] \
++	then \
++		filelist="%{-f*}" \
++	fi \
++	if [ ! -z "%{-p*}" ] \
++	then \
++		preamble="%{-p*}" \
++	fi \
++	if [ -z "%{kmodtool_generate_buildreqs}" ] \
++	then \
++		nobuildreqs="yes" \
++	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 c1b59e2..4986de3 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 8.0.45
-Release: 11%{dist}
+Release: 12%{dist}
 License: GPL
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.gz
@@ -46,7 +46,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
-* Wed Oct 18 2006 Jon Masters <jcm@redhat.com> 8.0.45-11
+* Wed Oct 18 2006 Jon Masters <jcm@redhat.com> 8.0.45-12
 - Synced kernel_module_package semantics with SuSE.
 - Updated kmodtool.