diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 32b901f2ba6c..ba5baf455f1d 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	boehm-gc
-PORTVERSION=	6.3
-PORTREVISION=	1
+PORTVERSION=	6.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 DISTNAME=	gc${PORTVERSION:S/.a/alpha/}
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index d7f4d66c7218..8ff3c05d70b3 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,2 +1,2 @@
-MD5 (gc6.3.tar.gz) = 8b37ee18cbeb1dfd1866958e280db871
-SIZE (gc6.3.tar.gz) = 772114
+MD5 (gc6.4.tar.gz) = ef03495e980b834a99c0e27eedaa546e
+SIZE (gc6.4.tar.gz) = 778553
diff --git a/devel/boehm-gc/files/patch-include-private-gcconfig.h b/devel/boehm-gc/files/patch-include-private-gcconfig.h
index 488a6b821632..128003988d62 100644
--- a/devel/boehm-gc/files/patch-include-private-gcconfig.h
+++ b/devel/boehm-gc/files/patch-include-private-gcconfig.h
@@ -1,66 +1,26 @@
---- include/private/gcconfig.h.orig	Thu May  6 08:10:54 2004
-+++ include/private/gcconfig.h	Sun Oct 31 02:55:05 2004
-@@ -170,7 +170,7 @@
- #   define mach_type_known
- # endif
- # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \
--     && !defined(__OpenBSD__) && !(__NetBSD__)
-+     && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
- #   define SPARC
- #   define DRSNX
- #   define mach_type_known
-@@ -314,6 +314,14 @@
+--- include/private/gcconfig.h.orig	Wed Dec 29 22:30:21 2004
++++ include/private/gcconfig.h	Wed Dec 29 22:30:39 2004
+@@ -328,6 +328,10 @@
  #    define X86_64
  #    define mach_type_known
  # endif
 +# if defined(__FreeBSD__) && defined(__amd64__)
 +#    define X86_64
 +#    define mach_type_known
-+#endif
-+# if defined(__FreeBSD__) && defined(__sparc__)
-+#    define SPARC
-+#    define mach_type_known
-+#endif
- # if defined(bsdi) && (defined(i386) || defined(__i386__))
- #    define I386
- #    define BSDI
-@@ -938,6 +946,23 @@
- #	define DATASTART ((ptr_t)(etext))
- #     endif
- #   endif
-+#   ifdef FREEBSD
-+#	define OS_TYPE "FREEBSD"
-+#	define SIG_SUSPEND SIGUSR1
-+#	define SIG_THR_RESTART SIGUSR2
-+#	define FREEBSD_STACKBOTTOM
-+#	ifdef __ELF__
-+#	    define DYNAMIC_LOADING
-+#	endif
-+	extern char etext[];
-+	extern char edata[];
-+	extern char end[];
-+#	define NEED_FIND_LIMIT
-+#	define DATASTART ((ptr_t)(&etext))
-+#	define DATAEND (GC_find_limit (DATASTART, TRUE))
-+#	define DATASTART2 ((ptr_t)(&edata))
-+#	define DATAEND2 ((ptr_t)(&end))
++# endif
+ # if defined(FREEBSD) && defined(__sparc__)
+ #    define SPARC
+ #    define mach_type_known
+@@ -1942,6 +1946,12 @@
+ #	define HEURISTIC2
+ 	extern char etext[];
+ #	define SEARCH_FOR_DATA_START
 +#   endif
++#   ifdef FREEBSD
++#     define OS_TYPE "FREEBSD"
++#     ifdef __ELF__
++#         define DYNAMIC_LOADING
++#     endif
+ #   endif
  # endif
  
- # ifdef I386
-@@ -1860,6 +1885,15 @@
- #   endif
- #   ifdef NETBSD
- #	define OS_TYPE "NETBSD"
-+#	ifdef __ELF__
-+#	    define DYNAMIC_LOADING
-+#	endif
-+#	define HEURISTIC2
-+	extern char etext[];
-+#	define SEARCH_FOR_DATA_START
-+#   endif
-+#   ifdef FREEBSD
-+#	define OS_TYPE "FREEBSD"
- #	ifdef __ELF__
- #	    define DYNAMIC_LOADING
- #	endif
diff --git a/devel/boehm-gc/files/patch-os_dep.c b/devel/boehm-gc/files/patch-os_dep.c
index eaf96359a60f..79b02c7ee7f4 100644
--- a/devel/boehm-gc/files/patch-os_dep.c
+++ b/devel/boehm-gc/files/patch-os_dep.c
@@ -1,6 +1,6 @@
---- os_dep.c.orig	Thu Jul  8 04:16:28 2004
-+++ os_dep.c	Fri Dec 17 03:29:13 2004
-@@ -700,7 +700,7 @@
+--- os_dep.c.orig	Sat Dec 18 10:42:19 2004
++++ os_dep.c	Wed Dec 29 22:48:03 2004
+@@ -699,7 +699,7 @@
      || defined(HURD) || defined(NETBSD)
  	static struct sigaction old_segv_act;
  #	if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) \
@@ -9,7 +9,7 @@
  	    static struct sigaction old_bus_act;
  #	endif
  #   else
-@@ -715,7 +715,7 @@
+@@ -714,7 +714,7 @@
  #   endif
      {
  #	if defined(SUNOS5SIGS) || defined(IRIX5)  \
@@ -18,34 +18,12 @@
  	  struct sigaction	act;
  
  	  act.sa_handler	= h;
-@@ -2372,7 +2372,7 @@
- #   endif
- #   ifdef FREEBSD
- #     define SIG_OK (sig == SIGBUS)
--#     define CODE_OK (code == BUS_PAGE_FAULT)
-+#     define CODE_OK TRUE
- #   endif
- # endif /* SUNOS4 || (FREEBSD && !SUNOS5SIGS) */
- 
-@@ -3943,7 +3943,11 @@
- #	 if defined(OPENBSD) || defined(NETBSD)
- #	   include <frame.h>
- #	 else
--#	   include <sys/frame.h>
-+#	   if defined(FREEBSD)
-+#	     include <machine/frame.h>
-+#	   else
-+#	     include <sys/frame.h>
-+#	   endif
- #	 endif
- #      endif
- #    endif
-@@ -3989,7 +3993,7 @@
- 
- #else /* No builtin backtrace; do it ourselves */
- 
--#if (defined(OPENBSD) || defined(NETBSD)) && defined(SPARC)
-+#if (defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD)) && defined(SPARC)
- #  define FR_SAVFP fr_fp
- #  define FR_SAVPC fr_pc
- #else
+@@ -734,7 +734,7 @@
+ #	  else
+ 	        (void) sigaction(SIGSEGV, &act, &old_segv_act);
+ #		if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
+-		   || defined(HPUX) || defined(HURD) || defined(NETBSD)
++		   || defined(HPUX) || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
+ 		    /* Under Irix 5.x or HP/UX, we may get SIGBUS.	*/
+ 		    /* Pthreads doesn't exist under Irix 5.x, so we	*/
+ 		    /* don't have to worry in the threads case.		*/