diff --git a/macros b/macros
index 0a7cc1c..7cbe282 100644
--- a/macros
+++ b/macros
@@ -151,4 +151,4 @@ unset DISPLAY\
 %__find_provides        /usr/lib/rpm/redhat/find-provides
 %__find_requires        /usr/lib/rpm/redhat/find-requires
 
-%__global_cflags	-O2 -g -pipe
+%__global_cflags	-O2 -g -pipe -D_FORTIFY_SOURCE=2
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 461c242..d47cf84 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -31,6 +31,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Mon Nov 15 2004 Elliot Lee <sopwith@redhat.com> 8.0.33-1
+- Add -D_FORTIFY_SOURCE=2 to global cflags (as per Jakub & Arjan's request)
+
 * Fri Oct  1 2004 Bill Nottingham <notting@redhat.com> 8.0.32-1
 - allow all symbol versioning in find_requires - matches RPM internal
   behavior