Index: libhb/fifo.c
===================================================================
--- libhb/fifo.c	(revision 3175)
+++ libhb/fifo.c	(working copy)
@@ -6,7 +6,7 @@
 
 #include "hb.h"
 
-#ifndef SYS_DARWIN
+#if !defined( SYS_DARWIN ) && !defined( SYS_FREEBSD )
 #include <malloc.h>
 #endif
 
Index: libhb/module.defs
===================================================================
--- libhb/module.defs	(revision 3175)
+++ libhb/module.defs	(working copy)
@@ -48,6 +48,8 @@
     LIBHB.GCC.D += SYS_MINGW PTW32_STATIC_LIB
 else ifeq ($(BUILD.system),solaris)
     LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
+else ifeq ($(BUILD.system),freebsd)
+    LIBHB.GCC.D += SYS_FREEBSD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
 else
     LIBHB.platform.D = SYS_UNKNOWN
 endif
Index: make/include/main.defs
===================================================================
--- make/include/main.defs	(revision 3175)
+++ make/include/main.defs	(working copy)
@@ -40,7 +40,7 @@
     MODULES += contrib/zlib
 endif
 
-ifneq (,$(filter $(BUILD.system),solaris))
+ifneq (,$(filter $(BUILD.system),solaris freebsd))
     MODULES += contrib/libiconv
 endif
 
@@ -66,6 +66,11 @@
     MODULES += gtk
 endif
 
+ifeq (1-freebsd,$(FEATURE.gtk)-$(BUILD.system))
+    ## build gtk when gtk+freebsd
+    MODULES += gtk
+endif
+
 ###############################################################################
 
 MODULES += doc
Index: make/configure.py
===================================================================
--- make/configure.py	(revision 3175)
+++ make/configure.py	(working copy)
@@ -969,7 +969,7 @@
     h = IfHost( 'enable assembly code in non-contrib modules', 'NOMATCH*-*-darwin*', 'NOMATCH*-*-linux*', none=optparse.SUPPRESS_HELP ).value
     grp.add_option( '--enable-asm', default=False, action='store_true', help=h )
 
-    h = IfHost( 'disable GTK GUI', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
+    h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
     grp.add_option( '--disable-gtk', default=False, action='store_true', help=h )
     h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
     grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h )