--- security/coreconf/config.mk.orig	Sun Feb  4 15:15:27 2001
+++ security/coreconf/config.mk	Sat Feb 17 17:54:41 2001
@@ -56,7 +56,7 @@
 #       each OS release.                                              #
 #######################################################################
 
-ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET)))
+ifeq (,$(filter-out FreeBSD OS2,$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
 else
 include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
--- security/psm/Makefile.in.orig	Thu Feb  8 08:38:39 2001
+++ security/psm/Makefile.in	Sat Feb 17 17:56:19 2001
@@ -28,7 +28,7 @@
 CORE_DEPTH=$(topsrcdir)/security
 
 include $(CORE_DEPTH)/coreconf/arch.mk
-ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET)))
+ifeq (,$(filter-out FreeBSD OS2,$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
 else
 include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
--- security/psm/server/Makefile.orig	Thu Feb  8 06:05:21 2001
+++ security/psm/server/Makefile	Sat Feb 17 17:58:52 2001
@@ -39,7 +39,7 @@
 # The following don't need a CPLUSPLUSRUNTIME defined:  WINNT, HP-UX
 # so filter them out.
 ifeq (,$(filter WINNT HP-UX,$(OS_ARCH)))
-ifeq ($(OS_ARCH), Linux)
+ifeq ($(OS_ARCH), FreeBSD)
 # On linux, we link with libstdc++ (we're always using egcs on linux, right?)
 CPLUSPLUSRUNTIME = -L /usr/lib -lstdc++ -lm
 else
@@ -59,11 +59,11 @@
 endif
 endif
 
-ifeq ($(OS_ARCH), Linux)
+ifeq ($(OS_ARCH), FreeBSD)
 ifdef USE_PTHREADS
 # Replace OS_LIBS, because the order of libpthread, libdl, and libc are
 # very important. Otherwise you get horrible crashes.
-OS_LIBS = -lpthread -ldl -lc
+OS_LIBS = -pthread
 endif
 endif
 
@@ -153,8 +153,8 @@
 XPCOM_LINK_LIBS = -lxpcom
 XPCOM_LIBS += $(DIST)/lib/libz.$(DLL_SUFFIX)
 else
-NSPR_LINK_LIBS = $(NSPR_LIBS)
-XPCOM_LINK_LIBS	= $(XPCOM_LIBS)
+NSPR_LINK_LIBS = -L$(DIST)/lib -lnspr4 -lplc4 -lplds4
+XPCOM_LINK_LIBS = -lxpcom
 endif
 
 ifndef MOZ_DIST