diff --git a/httperf/ChangeLog b/httperf/ChangeLog
index 3c0d7d1..89b104d 100755
--- a/httperf/ChangeLog
+++ b/httperf/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-26  Ted Bullock  <tbullock@canada.com>
+
+	* Removed getopt.c and getopt1.c from build process
+
+	* httperf.c Wrapped call to getopt.h in pre-processor checks
+
 2007-01-25  Ted Bullock  <tbullock@canada.com>
 
 	* wsesslog.c changed a sprintf call to the more secure snprintf
diff --git a/httperf/configure.ac b/httperf/configure.ac
index a8a6f31..3a04a8f 100755
--- a/httperf/configure.ac
+++ b/httperf/configure.ac
@@ -36,7 +36,7 @@ AC_CHECK_LIB(resolv, inet_aton)
 # Checks for header files.
 AC_FUNC_ALLOCA
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h libintl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h openssl/ssl.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h libintl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h openssl/ssl.h getopt.h])
 
 if test "$ac_cv_header_openssl_ssl_h" = "yes" \
 	-a "$ac_cv_lib_ssl_SSL_version" = "yes" \
diff --git a/httperf/src/httperf.c b/httperf/src/httperf.c
index 1b24cbc..9562203 100755
--- a/httperf/src/httperf.c
+++ b/httperf/src/httperf.c
@@ -61,7 +61,9 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <getopt.h>
+#ifdef HAVE_GETOPT_H
+  #include <getopt.h>
+#endif  
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/httperf/src/lib/Makefile.am b/httperf/src/lib/Makefile.am
index ecaeb51..1cde8f1 100755
--- a/httperf/src/lib/Makefile.am
+++ b/httperf/src/lib/Makefile.am
@@ -3,5 +3,5 @@ AM_CFLAGS = -Wall -O2 -I$(srcdir)/../ -I$(srcdir)/../../
 AM_LDFLAGS =
 
 noinst_LIBRARIES = libutil.a
-libutil_a_SOURCES = getopt.c getopt1.c ssl_writev.c
+libutil_a_SOURCES = ssl_writev.c