diff --git a/macros b/macros
index 8dce373..5069343 100644
--- a/macros
+++ b/macros
@@ -152,7 +152,7 @@ unset DISPLAY\
 %__find_provides        /usr/lib/rpm/redhat/find-provides
 %__find_requires        /usr/lib/rpm/redhat/find-requires
 
-%__global_cflags	-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
+%__global_cflags	-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
 
 # Disable lookups
 %_hkp_keyserver  %{nil}
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 878f820..d7ae522 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.36
+Version: 8.0.37
 Release: 1
 License: GPL
 Group: Development/System
@@ -35,6 +35,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Mon Aug 01 2005 Elliot Lee <sopwith@redhat.com> - 8.0.37-1
+- Patch from Uli: enable stack protector, fix sparc & ppc cflags
+
 * Thu Jun 16 2005 Elliot Lee <sopwith@redhat.com> - 8.0.36-1
 - Fix the fix
 
diff --git a/rpmrc b/rpmrc
index 7aa67e1..da849c3 100644
--- a/rpmrc
+++ b/rpmrc
@@ -16,20 +16,20 @@ optflags: alphaev6 %{__global_cflags} -mieee -mcpu=ev6
 optflags: alphaev67 %{__global_cflags} -mieee -mcpu=ev67
 
 optflags: sparc %{__global_cflags} -m32 -mcpu=v7 -mtune=ultrasparc
-optflags: sparcv8 %{__global_cflags} -m32 -mcpu=ultrasparc -mv8
+optflags: sparcv8 %{__global_cflags} -m32 -mcpu=v8
 optflags: sparcv9 %{__global_cflags} -m32 -mcpu=ultrasparc
 optflags: sparc64 %{__global_cflags} -m64 -mcpu=ultrasparc
 
 optflags: m68k %{__global_cflags}
 
-optflags: ppc %{__global_cflags} -m32 -fsigned-char
-optflags: ppciseries %{__global_cflags} -m32 -fsigned-char
-optflags: ppcpseries %{__global_cflags} -m32 -fsigned-char
-optflags: ppc64 %{__global_cflags} -m64 -fsigned-char -mminimal-toc
-optflags: ppc64iseries %{__global_cflags} -m64 -fsigned-char -mminimal-toc
-optflags: ppc64pseries %{__global_cflags} -m64 -fsigned-char -mminimal-toc
-optflags: ppc8260 %{__global_cflags} -m32 -fsigned-char
-optflags: ppc8560 %{__global_cflags} -m32 -fsigned-char
+optflags: ppc %{__global_cflags} -m32
+optflags: ppciseries %{__global_cflags} -m32
+optflags: ppcpseries %{__global_cflags} -m32
+optflags: ppc64 %{__global_cflags} -m64 -mminimal-toc
+optflags: ppc64iseries %{__global_cflags} -m64 -mminimal-toc
+optflags: ppc64pseries %{__global_cflags} -m64 -mminimal-toc
+optflags: ppc8260 %{__global_cflags} -m32
+optflags: ppc8560 %{__global_cflags} -m32
 
 optflags: parisc %{__global_cflags} -mpa-risc-1-0
 optflags: hppa1.0 %{__global_cflags} -mpa-risc-1-0