diff --git a/rpm-5.4.10-cpu-os-macros-fat-lto-objects.patch b/rpm-5.4.10-cpu-os-macros-fat-lto-objects.patch
deleted file mode 100644
index 683c1de..0000000
--- a/rpm-5.4.10-cpu-os-macros-fat-lto-objects.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur cpu-os-macros.orig/i586-linux/macros cpu-os-macros/i586-linux/macros
---- cpu-os-macros.orig/i586-linux/macros	2014-05-22 13:49:34.309259552 +0400
-+++ cpu-os-macros/i586-linux/macros	2014-05-22 14:41:56.000000000 +0400
-@@ -6,7 +6,7 @@
- %_arch			i386
- %_os			linux
- %_gnu			-gnu
--%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer -mtune=generic}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=i586 -fasynchronous-unwind-tables
-+%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -ffat-lto-objects -fomit-frame-pointer -mtune=generic}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=i586 -fasynchronous-unwind-tables
- 
- #==============================================================================
- # ---- configure macros.
-diff -Naur cpu-os-macros.orig/i686-linux/macros cpu-os-macros/i686-linux/macros
---- cpu-os-macros.orig/i686-linux/macros	2014-05-22 13:49:34.309259552 +0400
-+++ cpu-os-macros/i686-linux/macros	2014-05-22 14:41:48.000000000 +0400
-@@ -6,7 +6,7 @@
- %_arch			i386
- %_os			linux
- %_gnu			-gnu
--%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32 -mtune=generic} -march=i686 -fasynchronous-unwind-tables
-+%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -ffat-lto-objects -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32 -mtune=generic} -march=i686 -fasynchronous-unwind-tables
- 
- #==============================================================================
- # ---- configure macros.
-diff -Naur cpu-os-macros.orig/x86_64-linux/macros cpu-os-macros/x86_64-linux/macros
---- cpu-os-macros.orig/x86_64-linux/macros	2014-05-22 13:49:34.310259552 +0400
-+++ cpu-os-macros/x86_64-linux/macros	2014-05-22 14:44:09.314521435 +0400
-@@ -6,7 +6,7 @@
- %_arch			x86_64
- %_os			linux
- %_gnu			-gnu
--%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -m64 -mtune=generic}
-+%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -ffat-lto-objects -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -m64 -mtune=generic}
- 
- #==============================================================================
- # ---- configure macros.
diff --git a/rpm-5.4.10-fat-lto-objects.patch b/rpm-5.4.10-fat-lto-objects.patch
new file mode 100644
index 0000000..ed49d41
--- /dev/null
+++ b/rpm-5.4.10-fat-lto-objects.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.10.orig/macros/mandriva.in	2014-05-26 14:37:35.534125641 +0400
++++ rpm-5.4.10/macros/mandriva.in	2014-05-26 14:38:35.576130442 +0400
+@@ -160,7 +160,7 @@
+ %Werror_cflags -Wformat -Werror=format-security
+ 
+ %_ssp_cflags -fstack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
+-%__common_cflags -O2 %{debugcflags} -pipe %{Werror_cflags} %{?_fortify_cflags}
++%__common_cflags -O2 %{debugcflags} -pipe %{Werror_cflags} %{?_fortify_cflags} -ffat-lto-objects
+ %__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags}
+ 
+ # Servers opt flags.
diff --git a/rpm.spec b/rpm.spec
index e0e4edd..0ac4e30 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -60,7 +60,7 @@ Summary:	The RPM package management system
 Name:		rpm
 Epoch:		1
 Version:	%{libver}.%{minorver}
-Release:	%{?prereldate:0.%{prereldate}.}32
+Release:	%{?prereldate:0.%{prereldate}.}33
 License:	LGPLv2.1+
 Group:		System/Configuration/Packaging
 URL:		http://rpm5.org/
@@ -490,7 +490,7 @@ Patch506:	rpm-5.4.10-nodejs-dependency-generator.patch
 Patch508:	rpm-5.4.10-hardening.patch
 
 # -ffat-lto-objects by default
-Patch509: rpm-5.4.10-cpu-os-macros-fat-lto-objects.patch
+Patch509:	rpm-5.4.10-fat-lto-objects.patch
 
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	bzip2-devel
@@ -903,7 +903,7 @@ This package contains the RPM API documentation generated in HTML format.
 %patch505 -p1 -b .urlgetfile~
 %patch506 -p1 -b .nodejs~
 %patch508 -p1 -b .hardening~
-
+%patch509 -p1 -b .fat_lto_cpu_os_macros~
 
 #required by P55, P80, P81, P94..
 ./autogen.sh
@@ -912,7 +912,6 @@ mkdir -p cpu-os-macros
 tar -zxf %{SOURCE3} -C cpu-os-macros
 %patch145 -p1
 # %patch507 -p0 -b .hardening_cpu_os_macros~
-%patch509 -p0 -b .fat_lto_cpu_os_macros~
 
 %build
 %configure2_5x	--enable-nls \