diff --git a/httperf/ChangeLog b/httperf/ChangeLog
index 93988dc..0170222 100755
--- a/httperf/ChangeLog
+++ b/httperf/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-26  Ted Bullock  <tbullock@canada.com>
+
+	* Re-Added the getopt.c and getopt1.c to the build process
+	httperf now compiles on Linux, OpenBSD, FreeBSD,  Solaris
+	(with cc and gcc) and HP-UX 11i (with cc and gcc)
+
 2007-01-26  Ted Bullock  <tbullock@canada.com>
 
 	* Revised Makefile.am for src directories to explicitly include the
diff --git a/httperf/configure.ac b/httperf/configure.ac
index 3a04a8f..2ef6369 100755
--- a/httperf/configure.ac
+++ b/httperf/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT(httperf, 0.9, httperf@linux.hpl.hp.com)
+AC_INIT(httperf, 0.9.0, httperf@linux.hpl.hp.com)
 AC_CONFIG_SRCDIR([src/httperf.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -19,13 +19,14 @@ if test "$enable_debug" = yes; then
 fi
 
 # Checks for programs.
-AC_PROG_CC
 AC_GNU_SOURCE
+AC_PROG_CC([cc gcc])
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AC_PROG_GCC_TRADITIONAL
 
 # Checks for libraries.
+AC_CHECK_LIB(m, sqrt)
 AC_CHECK_LIB(crypto, main)
 AC_CHECK_LIB(ssl, SSL_version)
 # The following checks are for solaris and its ilk
@@ -71,6 +72,6 @@ AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
 AC_FUNC_STRTOD
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([gethostbyname gettimeofday memset munmap select socket strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol strtoul inet_aton])
+AC_CHECK_FUNCS([gethostbyname gettimeofday memset munmap select socket strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol strtoul inet_aton getopt_long])
 
 AC_OUTPUT(Makefile man/Makefile src/stat/Makefile src/lib/Makefile src/gen/Makefile src/Makefile)
diff --git a/httperf/src/Makefile.am b/httperf/src/Makefile.am
index 19a64ad..6685b4d 100755
--- a/httperf/src/Makefile.am
+++ b/httperf/src/Makefile.am
@@ -1,8 +1,7 @@
 SUBDIRS = gen lib stat
 
 # what flags you want to pass to the C compiler & linker
-AM_CFLAGS = -Wall -I$(srcdir)/{gen,lib,stat}/ -I.
-AM_LDFLAGS = -lm
+AM_CFLAGS = -I$(srcdir) -I$(srcdir)/gen -I$(srcdir)/lib -I$(srcdir)/stat
 
 bin_PROGRAMS = httperf idleconn
 httperf_SOURCES = httperf.c httperf.h object.c object.h call.c call.h conn.c \
diff --git a/httperf/src/gen/Makefile.am b/httperf/src/gen/Makefile.am
index 899f691..740f27e 100755
--- a/httperf/src/gen/Makefile.am
+++ b/httperf/src/gen/Makefile.am
@@ -1,5 +1,5 @@
 # what flags you want to pass to the C compiler & linker
-AM_CFLAGS = -Wall -O2 -I$(srcdir)/../ -I$(srcdir)/../../ -I.. -I$(srcdir)
+AM_CFLAGS = -I$(srcdir)/..
 AM_LDFLAGS =
 
 noinst_LIBRARIES = libgen.a
diff --git a/httperf/src/httperf.c b/httperf/src/httperf.c
index 9562203..1b24cbc 100755
--- a/httperf/src/httperf.c
+++ b/httperf/src/httperf.c
@@ -61,9 +61,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#ifdef HAVE_GETOPT_H
-  #include <getopt.h>
-#endif  
+#include <getopt.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/httperf/src/lib/Makefile.am b/httperf/src/lib/Makefile.am
index 1cde8f1..cefeb30 100755
--- a/httperf/src/lib/Makefile.am
+++ b/httperf/src/lib/Makefile.am
@@ -1,7 +1,6 @@
 # what flags you want to pass to the C compiler & linker
-AM_CFLAGS = -Wall -O2 -I$(srcdir)/../ -I$(srcdir)/../../
 AM_LDFLAGS =
 
 noinst_LIBRARIES = libutil.a
-libutil_a_SOURCES = ssl_writev.c
+libutil_a_SOURCES = getopt.c getopt.h getopt1.c ssl_writev.c
 
diff --git a/httperf/src/stat/Makefile.am b/httperf/src/stat/Makefile.am
index 353b10e..08498aa 100755
--- a/httperf/src/stat/Makefile.am
+++ b/httperf/src/stat/Makefile.am
@@ -1,6 +1,5 @@
 # what flags you want to pass to the C compiler & linker
-AM_CFLAGS = -Wall -O2 -I$(srcdir)/../ -I$(srcdir)/../gen/ -I$(srcdir)/../../
-AM_LDFLAGS =
+AM_CFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gen
 
 noinst_LIBRARIES = libstat.a
 libstat_a_SOURCES = basic.c sess_stat.c print_reply.c stats.h