diff -uprN filebench-1.4.8/configure.in filebench-1.4.8-Linux-Port/configure.in
--- filebench-1.4.8/configure.in	2009-06-08 13:18:00.000000000 -0400
+++ filebench-1.4.8-Linux-Port/configure.in	2009-07-22 19:53:41.000000000 -0400
@@ -80,7 +80,7 @@ case "$host_os$host_cpu" in
 	##DEFINES="-DLINUX_PORT -D_XOPEN_SOURCE=500 -D_LARGEFILE_SOURCE64 -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_UNIX98"
 	DEFINES="-DLINUX_PORT -D_GNU_SOURCE -D__USE_LARGEFILE64"
 	CFLAGS="${CFLAGS=} -O -I/usr/include/nptl -DYYDEBUG=1"
-	LDLIBS="-lm  -lm -lpthread -laio -lfl -lrt -ltecla -lsocket -lnsl"
+	LDLIBS="-lm  -lm -lpthread -laio -lfl -lrt -ltecla -lnsl"
 	LFLAGS="-t"
 	YFLAGS="-d"
         AC_DEFINE(HAVE_OFF64_T, 1,
diff -uprN filebench-1.4.8/filebench/multi_client_sync.c filebench-1.4.8-Linux-Port/filebench/multi_client_sync.c
--- filebench-1.4.8/filebench/multi_client_sync.c	2009-06-08 16:23:59.000000000 -0400
+++ filebench-1.4.8-Linux-Port/filebench/multi_client_sync.c	2009-07-22 19:53:30.000000000 -0400
@@ -46,6 +46,9 @@ mc_sync_open_sock(char *master_name, int
 	struct sockaddr_in client_in;
 	struct sockaddr_in master_in;
 	struct hostent master_info;
+#ifdef LINUX_PORT
+	struct hostent *master_result;
+#endif
 	int error_num;
 	char buffer[MCS_MSGLENGTH];
 
@@ -65,8 +68,13 @@ mc_sync_open_sock(char *master_name, int
 		return (FILEBENCH_ERROR);
 	}
 
+#ifdef LINUX_PORT
+	if (gethostbyname_r(master_name, &master_info, buffer, MCS_MSGLENGTH,
+	    &master_result, &error_num) == NULL) {
+#else
 	if (gethostbyname_r(master_name, &master_info, buffer, MCS_MSGLENGTH,
 	    &error_num) == NULL) {
+#endif
 		filebench_log(LOG_ERROR, "could not locate sync master");
 		return (FILEBENCH_ERROR);
 	}
diff -uprN filebench-1.4.8/filebench/multi_client_sync.h filebench-1.4.8-Linux-Port/filebench/multi_client_sync.h
--- filebench-1.4.8/filebench/multi_client_sync.h	2009-06-08 16:24:11.000000000 -0400
+++ filebench-1.4.8-Linux-Port/filebench/multi_client_sync.h	2009-07-22 19:53:31.000000000 -0400
@@ -28,7 +28,12 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+
+#ifdef LINUX_PORT
+#include <netinet/ip.h>
+#else
 #include <inet/ip.h>
+#endif
 
 int mc_sync_open_sock(char *master_name, int master_port, char *client_name);
 int mc_sync_synchronize(int synch_point);
diff -uprN filebench-1.4.8/filebench/parser_gram.y filebench-1.4.8-Linux-Port/filebench/parser_gram.y
--- filebench-1.4.8/filebench/parser_gram.y	2009-06-10 11:16:26.000000000 -0400
+++ filebench-1.4.8-Linux-Port/filebench/parser_gram.y	2009-07-22 19:53:18.000000000 -0400
@@ -3735,6 +3735,8 @@ parser_fscheck(cmd_t *cmd)
 		return;
 	}
 
+#ifndef LINUX_PORT
+	/* f_basetype and FSTYPEZ are not present on Linux */
 	if (strncmp(filesys, statbuf.f_basetype, FSTYPSZ) != 0) {
 		filebench_log(LOG_ERROR,
 		    "File System is of type %s, NOT %s as indicated",
@@ -3742,6 +3744,7 @@ parser_fscheck(cmd_t *cmd)
 		filebench_shutdown(1);
 		return;
 	}
+#endif
 }
 
 /*