diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index ec957e879d54..2ee5c8f73757 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -71,11 +71,6 @@ PLIST_SUB+=	INSIGHT='@comment '
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
-
-.if ${OSVERSION} >= 800000
-BROKEN=		does not compile
-.endif
-
 .endif
 
 post-patch:
diff --git a/devel/gdb6/files/patch-gdb-amd64fbsd-nat.c b/devel/gdb6/files/patch-gdb-amd64fbsd-nat.c
new file mode 100644
index 000000000000..0abe97392477
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb-amd64fbsd-nat.c
@@ -0,0 +1,15 @@
+--- gdb/amd64fbsd-nat.c.orig	2005-12-17 17:33:59.000000000 -0500
++++ gdb/amd64fbsd-nat.c	2009-09-10 02:29:33.000000000 -0400
+@@ -125,10 +125,12 @@
+   regcache_raw_supply (regcache, 13, &pcb->pcb_r13);
+   regcache_raw_supply (regcache, 14, &pcb->pcb_r14);
+   regcache_raw_supply (regcache, 15, &pcb->pcb_r15);
++#if defined(__FreeBSD_version) && __FreeBSD_version < 800000
+   regcache_raw_supply (regcache, AMD64_DS_REGNUM, &pcb->pcb_ds);
+   regcache_raw_supply (regcache, AMD64_ES_REGNUM, &pcb->pcb_es);
+   regcache_raw_supply (regcache, AMD64_FS_REGNUM, &pcb->pcb_fs);
+   regcache_raw_supply (regcache, AMD64_GS_REGNUM, &pcb->pcb_gs);
++#endif
+ 
+   return 1;
+ }
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index ec957e879d54..2ee5c8f73757 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -71,11 +71,6 @@ PLIST_SUB+=	INSIGHT='@comment '
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
-
-.if ${OSVERSION} >= 800000
-BROKEN=		does not compile
-.endif
-
 .endif
 
 post-patch:
diff --git a/devel/gdb66/files/patch-gdb-amd64fbsd-nat.c b/devel/gdb66/files/patch-gdb-amd64fbsd-nat.c
new file mode 100644
index 000000000000..0abe97392477
--- /dev/null
+++ b/devel/gdb66/files/patch-gdb-amd64fbsd-nat.c
@@ -0,0 +1,15 @@
+--- gdb/amd64fbsd-nat.c.orig	2005-12-17 17:33:59.000000000 -0500
++++ gdb/amd64fbsd-nat.c	2009-09-10 02:29:33.000000000 -0400
+@@ -125,10 +125,12 @@
+   regcache_raw_supply (regcache, 13, &pcb->pcb_r13);
+   regcache_raw_supply (regcache, 14, &pcb->pcb_r14);
+   regcache_raw_supply (regcache, 15, &pcb->pcb_r15);
++#if defined(__FreeBSD_version) && __FreeBSD_version < 800000
+   regcache_raw_supply (regcache, AMD64_DS_REGNUM, &pcb->pcb_ds);
+   regcache_raw_supply (regcache, AMD64_ES_REGNUM, &pcb->pcb_es);
+   regcache_raw_supply (regcache, AMD64_FS_REGNUM, &pcb->pcb_fs);
+   regcache_raw_supply (regcache, AMD64_GS_REGNUM, &pcb->pcb_gs);
++#endif
+ 
+   return 1;
+ }