diff --git a/src/java/com/threerings/util/signal/i686-Linux/libsignal.so b/src/java/com/threerings/util/signal/i686-Linux/libsignal.so
deleted file mode 100755
index 0f6360de9..000000000
Binary files a/src/java/com/threerings/util/signal/i686-Linux/libsignal.so and /dev/null differ
diff --git a/src/java/com/threerings/util/signal/i686-Linux/Makefile b/src/java/com/threerings/util/signal/unix/Makefile
similarity index 69%
rename from src/java/com/threerings/util/signal/i686-Linux/Makefile
rename to src/java/com/threerings/util/signal/unix/Makefile
index 1292ac9a2..e7c3747dd 100644
--- a/src/java/com/threerings/util/signal/i686-Linux/Makefile
+++ b/src/java/com/threerings/util/signal/unix/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 2004/10/20 03:30:20 mdb Exp $
+# $Id$
 
 #
 # Executable definitions
@@ -14,14 +14,18 @@ MKDIR=mkdir
 
 ROOT=../../../../../../..
 LIBRARIES_PATH=
-INSTALL_PATH=${ROOT}/dist/lib/i686-Linux
+ARCH!=uname -p
+OS!=uname -s
+OSINCDIR!=uname -s | tr 'A-Z' 'a-z'
+OSDIR=${ARCH}-${OS}
+INSTALL_PATH=${ROOT}/dist/lib/${OSDIR}
 
 #
 # Parameter and file definitions
 
-INCLUDES=-I.. -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
+INCLUDES=-I.. -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OSINCDIR}
 LIBRARIES=
-TARGET=libsignal.so
+TARGET=${OSDIR}/libsignal.so
 
 #
 # Target definitions
@@ -33,7 +37,8 @@ install: ${TARGET}
 	cp ${TARGET} ${INSTALL_PATH}
 
 ${TARGET}: com_threerings_util_signal_SignalManager.c
-	@echo Compiling SignalManager.c
+	@echo "Compiling SignalManager.c
+	@mkdir -p ${OSDIR}
 	@${CC} ${INCLUDES} -c com_threerings_util_signal_SignalManager.c \
 	    -o com_threerings_util_signal_SignalManager.o
 	@echo Creating libsignal.so
diff --git a/src/java/com/threerings/util/signal/i686-Linux/com_threerings_util_signal_SignalManager.c b/src/java/com/threerings/util/signal/unix/com_threerings_util_signal_SignalManager.c
similarity index 96%
rename from src/java/com/threerings/util/signal/i686-Linux/com_threerings_util_signal_SignalManager.c
rename to src/java/com/threerings/util/signal/unix/com_threerings_util_signal_SignalManager.c
index 6045fd35e..e8113cf77 100644
--- a/src/java/com/threerings/util/signal/i686-Linux/com_threerings_util_signal_SignalManager.c
+++ b/src/java/com/threerings/util/signal/unix/com_threerings_util_signal_SignalManager.c
@@ -1,5 +1,5 @@
 /**
- * $Id: com_threerings_util_signal_SignalManager.c,v 1.1 2003/03/31 02:10:04 mdb Exp $
+ * $Id$
  */
 
 #include <signal.h>
diff --git a/src/java/com/threerings/util/signal/unix/i386-FreeBSD/libsignal.so b/src/java/com/threerings/util/signal/unix/i386-FreeBSD/libsignal.so
new file mode 100755
index 000000000..c9ded61eb
Binary files /dev/null and b/src/java/com/threerings/util/signal/unix/i386-FreeBSD/libsignal.so differ