nginx-0.0.1-2004-01-23-12:26:18 import
diff --git a/auto/options b/auto/options
index 2356a76..80302e4 100644
--- a/auto/options
+++ b/auto/options
@@ -6,6 +6,9 @@
 
 TEST_BUILD_DEVPOLL=NO
 
+SELECT=YES
+POLL=YES
+
 HTTP_REWRITE=YES
 HTTP_GZIP=YES
 HTTP_PROXY=YES
@@ -35,6 +38,9 @@
 
         --builddir=*)                    OBJS="$value"              ;;
 
+        --without-select_module)         SELECT=NO                  ;;
+        --without-poll_module)           POLL=NO                    ;;
+
         --without-http_rewrite_module)   HTTP_REWRITE=NO            ;;
         --without-http_gzip_module)      HTTP_GZIP=NO               ;;
         --without-http_proxy_module)     HTTP_PROXY=NO              ;;
@@ -57,17 +63,22 @@
 
 if [ $help = yes ]; then
     echo
-    echo "  --help                        this message"
-
-    echo "  --without-http_gzip_module    disable http_gzip_module"
-    echo "  --without-http_proxy_module   disable http_proxy_module"
-
-    echo "  --with-cc=NAME                name of or path to C compiler"
+    echo "  --help                         this message"
     echo
 
-    echo "  --with-pcre=DIR               path to PCRE library"
-    echo "  --with-md5=DIR                path to md5 library"
-    echo "  --with-zlib=DIR               path to zlib library"
+    echo "  --without-select_module        disable select_module"
+    echo "  --without-poll_module          disable poll_module"
+
+    echo "  --without-http_rewrite_module  disable http_rewrite_module"
+    echo "  --without-http_gzip_module     disable http_gzip_module"
+    echo "  --without-http_proxy_module    disable http_proxy_module"
+
+    echo "  --with-cc=NAME                 name of or path to C compiler"
+    echo
+
+    echo "  --with-pcre=DIR                path to PCRE library"
+    echo "  --with-md5=DIR                 path to md5 library"
+    echo "  --with-zlib=DIR                path to zlib library"
     echo
 
     exit 1
diff --git a/auto/os/freebsd b/auto/os/freebsd
index b26b639..9684102 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -2,12 +2,21 @@
 
 CORE_INCS="$UNIX_INCS"
 CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS"
-CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS $SELECT_SRCS $POLL_SRCS"
-EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE $POLL_MODULE"
+CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS"
 
 MD5_LIB="-lmd"
 ZLIB_LIB="-lz"
 
+if [ $SELECT = YES ]; then
+    CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
+    EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
+fi
+
+if [ $POLL = YES ]; then
+    CORE_SRCS="$CORE_SRCS $POLL_SRCS"
+    EVENT_MODULES="$EVENT_MODULES $POLL_MODULE"
+fi
+
 version=`grep "#define __FreeBSD_version" /usr/include/osreldate.h \
          | sed -e 's/^.* \(.*\)$/\1/'`