diff -u openjdk-6-6b14/debian/rules openjdk-6-6b14/debian/rules
--- openjdk-6-6b14/debian/rules
+++ openjdk-6-6b14/debian/rules
@@ -134,12 +134,10 @@
 
 ifeq ($(with_hotspot),original)
   DISTRIBUTION_PATCHES = \
-	$(if $(filter $(distribution),Ubuntu),debian/patches/gcc-no-stack-protector-original.diff) \
 	debian/patches/ld-symbolic-functions-original.diff \
 	debian/patches/set-exec-name-original.diff
 else
   DISTRIBUTION_PATCHES = \
-	$(if $(filter $(distribution),Ubuntu),debian/patches/gcc-no-stack-protector.diff) \
 	debian/patches/ld-symbolic-functions.diff \
 	debian/patches/set-exec-name.diff \
 	debian/patches/hotspot-warn-no-errformat.diff
@@ -166,15 +164,7 @@
 
 ifeq ($(distribution),Ubuntu)
   DISTRIBUTION_PATCHES += \
-	debian/patches/openjdk-ubuntu-branding.patch \
-	debian/patches/gcc-jdk-no-stack-protector.diff
-  ifeq ($(with_hotspot),original)
-    DISTRIBUTION_PATCHES += \
-	debian/patches/gcc-hotspot-no-stack-protector-original.diff
-  else
-    DISTRIBUTION_PATCHES += \
-	debian/patches/gcc-hotspot-no-stack-protector.diff
-  endif
+	debian/patches/openjdk-ubuntu-branding.patch
   ifneq (,$(filter $(DEB_HOST_ARCH),armel i386))
     DISTRIBUTION_PATCHES += \
 	debian/patches/zero-port-opt.diff \
reverted:
--- openjdk-6-6b14/debian/patches/gcc-no-stack-protector-original.diff
+++ openjdk-6-6b14.orig/debian/patches/gcc-no-stack-protector-original.diff
@@ -1,32 +0,0 @@
---- openjdk/hotspot/build/linux/makefiles/gcc.make~	2007-11-24 14:49:38.366274732 +0100
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-11-24 15:00:51.616430558 +0100
-@@ -62,6 +62,7 @@
- CFLAGS += -fno-exceptions
- CFLAGS += -D_REENTRANT
- CFLAGS += -fcheck-new
-+CFLAGS += -fno-stack-protector -U_FORTIFY_SOURCE
- 
- # Always generate full debuginfo on Linux.  It'll be in a separate
- # debuginfo package when building RPMs.
---- openjdk/corba/make/common/Defs-linux.gmk~	2008-03-28 20:11:54.075568406 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk	2008-03-28 20:13:51.537340290 +0100
-@@ -107,6 +107,8 @@
-   LDFLAGS_COMMON        += $(LDFLAGS_COMMON_$(ARCH))
- endif
- 
-+CFLAGS_REQUIRED         += -fno-stack-protector -U_FORTIFY_SOURCE
-+
- # Add in platform specific optimizations for all opt levels
- CC_HIGHEST_OPT += $(_OPT_$(ARCH))
- CC_HIGHER_OPT  += $(_OPT_$(ARCH))
---- openjdk/jdk/make/common/Defs-linux.gmk~	2008-03-28 20:11:54.095568707 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk	2008-03-28 20:14:15.037694787 +0100
-@@ -117,6 +117,8 @@
-   LDFLAGS_COMMON        += $(LDFLAGS_COMMON_$(ARCH))
- endif
- 
-+CFLAGS_REQUIRED         += -fno-stack-protector -U_FORTIFY_SOURCE
-+
- # Add in platform specific optimizations for all opt levels
- CC_HIGHEST_OPT += $(_OPT_$(ARCH))
- CC_HIGHER_OPT  += $(_OPT_$(ARCH))
reverted:
--- openjdk-6-6b14/debian/patches/gcc-jdk-no-stack-protector.diff
+++ openjdk-6-6b14.orig/debian/patches/gcc-jdk-no-stack-protector.diff
@@ -1,15 +0,0 @@
---- openjdk/jdk/make/common/Defs-linux.gmk~	2009-01-15 21:41:19.000000000 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk	2009-01-17 14:32:08.000000000 +0100
-@@ -86,9 +86,9 @@
- #
- # Default optimization
- #
--CC_HIGHEST_OPT = -O3
--CC_HIGHER_OPT  = -O3
--CC_LOWER_OPT   = -O2
-+CC_HIGHEST_OPT = -O3 -fno-stack-protector -U_FORTIFY_SOURCE
-+CC_HIGHER_OPT  = -O3 -fno-stack-protector -U_FORTIFY_SOURCE
-+CC_LOWER_OPT   = -O2 -fno-stack-protector -U_FORTIFY_SOURCE
- CC_NO_OPT      =
- 
- ifeq ($(PRODUCT), java)
reverted:
--- openjdk-6-6b14/debian/patches/gcc-hotspot-no-stack-protector-original.diff
+++ openjdk-6-6b14.orig/debian/patches/gcc-hotspot-no-stack-protector-original.diff
@@ -1,11 +0,0 @@
---- openjdk/hotspot/build/linux/makefiles/gcc.make~	2007-11-29 12:38:22.578339247 +0100
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-11-29 12:42:28.742052571 +0100
-@@ -103,7 +103,7 @@
- CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
- 
- # The flags to use for an Optimized g++ build
--OPT_CFLAGS += -O3
-+OPT_CFLAGS += -O3 -fno-stack-protector -U_FORTIFY_SOURCE
- 
- # Hotspot uses very unstrict aliasing turn this optimization off
- OPT_CFLAGS += -fno-strict-aliasing
reverted:
--- openjdk-6-6b14/debian/patches/gcc-no-stack-protector.diff
+++ openjdk-6-6b14.orig/debian/patches/gcc-no-stack-protector.diff
@@ -1,32 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make.orig	2008-12-02 14:56:38.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make	2008-12-02 14:58:56.000000000 +0100
-@@ -67,6 +67,7 @@
- CFLAGS += -fno-exceptions
- CFLAGS += -D_REENTRANT
- CFLAGS += -fcheck-new
-+CFLAGS += -fno-stack-protector -U_FORTIFY_SOURCE
- 
- # Always generate full debuginfo on Linux.  It'll be in a separate
- # debuginfo package when building RPMs.
---- openjdk/corba/make/common/Defs-linux.gmk~	2008-03-28 20:11:54.075568406 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk	2008-03-28 20:13:51.537340290 +0100
-@@ -107,6 +107,8 @@
-   LDFLAGS_COMMON        += $(LDFLAGS_COMMON_$(ARCH))
- endif
- 
-+CFLAGS_REQUIRED         += -fno-stack-protector -U_FORTIFY_SOURCE
-+
- # Add in platform specific optimizations for all opt levels
- CC_HIGHEST_OPT += $(_OPT_$(ARCH))
- CC_HIGHER_OPT  += $(_OPT_$(ARCH))
---- openjdk/jdk/make/common/Defs-linux.gmk~	2008-03-28 20:11:54.095568707 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk	2008-03-28 20:14:15.037694787 +0100
-@@ -117,6 +117,8 @@
-   LDFLAGS_COMMON        += $(LDFLAGS_COMMON_$(ARCH))
- endif
- 
-+CFLAGS_REQUIRED         += -fno-stack-protector -U_FORTIFY_SOURCE
-+
- # Add in platform specific optimizations for all opt levels
- CC_HIGHEST_OPT += $(_OPT_$(ARCH))
- CC_HIGHER_OPT  += $(_OPT_$(ARCH))
reverted:
--- openjdk-6-6b14/debian/patches/gcc-hotspot-no-stack-protector.diff
+++ openjdk-6-6b14.orig/debian/patches/gcc-hotspot-no-stack-protector.diff
@@ -1,11 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make~	2007-11-29 12:38:22.578339247 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make	2007-11-29 12:42:28.742052571 +0100
-@@ -103,7 +103,7 @@
- CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
- 
- # The flags to use for an Optimized g++ build
--OPT_CFLAGS += -O3
-+OPT_CFLAGS += -O3 -fno-stack-protector -U_FORTIFY_SOURCE
- 
- # Hotspot uses very unstrict aliasing turn this optimization off
- OPT_CFLAGS += -fno-strict-aliasing