--- Makefile.system.orig	2010-01-28 15:11:08.000000000 -0500
+++ Makefile.system	2011-09-05 12:30:26.000000000 -0400
@@ -93,6 +93,11 @@
 EXTRALIB	+= -lm
 endif
 
+ifeq ($(OSNAME), FreeBSD)
+EXTRALIB	+= -lm
+FCOMMON_OPT	+= -Wl,-rpath=%%_GCC_RUNTIME%%
+endif
+
 ifeq ($(OSNAME), AIX)
 EXTRALIB	+= -lm
 endif
@@ -608,7 +612,7 @@
 GREP	= grep
 endif
 
-MD5SUM	= md5sum
+MD5SUM	= md5
 AWK	= awk
 
 REVISION = -r$(VERSION)
@@ -631,15 +635,6 @@
 LIBSUFFIX = a
 endif
 
-ifndef DYNAMIC_ARCH
-ifndef SMP
-LIBNAME		= $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
-LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX)
-else
-LIBNAME		= $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX)
-LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX)
-endif
-else
 ifndef SMP
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
@@ -647,7 +642,6 @@
 LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
 LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
 endif
-endif
 
 
 LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
@@ -661,7 +655,7 @@
 LIBS_P		= $(TOPDIR)/$(LIBNAME_P)
 
 export OSNAME
-export ARCH
+export ARCH_
 export CORE
 export LIBCORE
 export PGCPATH