diff --git a/CHANGES b/CHANGES
index e04fcc6eb7..0af3a0a896 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,18 @@
+1.6-dev.36 Mon Jan 31 08:45:35 PST 2011
+
+- Adding more configure options for finding dependencies, (Jon Siwek)
+
+    --with-flex=PATH       path to flex executable
+    --with-bison=PATH      path to bison executable
+    --with-perl=PATH       path to perl executable
+    --with-python=PATH     path to Python interpreter
+    --with-python-lib=PATH path to libpython
+    --with-python-inc=PATH path to Python headers
+    --with-swig=PATH       path to SWIG executable
+
+- Fixing typo in PCAPTests.cmake  (Jon Siwek)
+
+
 1.6-dev.33 Mon Jan 24 15:29:04 PST 2011
 
 - Fixing bug in SMB analyzer. (Robin Sommer)
diff --git a/VERSION b/VERSION
index ecf8d5a5da..3ea16f0f3f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6-dev.35
+1.6-dev.36
diff --git a/aux/bro-aux b/aux/bro-aux
index 89476012d9..06feef2851 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 89476012d96039a9ed415993b2f6f7601436cda2
+Subproject commit 06feef28515a8527a7c290faecc343d341a9cc68
diff --git a/aux/broccoli b/aux/broccoli
index 9ad8f64aec..b7115b8421 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 9ad8f64aecbb3320eaee087a867b5742ccfdafa1
+Subproject commit b7115b84210dcf5b04c900d7490f5dab968227c4
diff --git a/aux/broctl b/aux/broctl
index 43bdb0fbf1..d10b20da82 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 43bdb0fbf1a0a55fa7a862d19c471c279df62a73
+Subproject commit d10b20da8227d0b9bc8bfecb6a044c8b470e910f
diff --git a/configure b/configure
index cc18423584..f1d864640d 100755
--- a/configure
+++ b/configure
@@ -40,11 +40,18 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --with-bind=PATH       path to BIND install root
     --with-pcap=PATH       path to libpcap install root
     --with-binpac=PATH     path to BinPAC install root
+    --with-flex=PATH       path to flex executable
+    --with-bison=PATH      path to bison executable
+    --with-perl=PATH       path to perl executable
 
   Optional Packages in Non-Standard Locations:
     --with-libmagic=PATH   path to libmagic install root
     --with-geoip=PATH      path to the libGeoIP install root
     --with-perftools=PATH  path to Google Perftools install root
+    --with-python=PATH     path to Python interpreter
+    --with-python-lib=PATH path to libpython
+    --with-python-inc=PATH path to Python headers
+    --with-swig=PATH       path to SWIG executable
 
   Packaging Options (for developers):
     --ignore-dirs=PATHS    paths to ignore when creating source package
@@ -157,6 +164,15 @@ while [ $# -ne 0 ]; do
         --with-binpac=*)
             append_cache_entry BinPAC_ROOT_DIR PATH $optarg
             ;;
+        --with-flex=*)
+            append_cache_entry FLEX_EXECUTABLE PATH $optarg
+            ;;
+        --with-bison=*)
+            append_cache_entry BISON_EXECUTABLE PATH $optarg
+            ;;
+        --with-perl=*)
+            append_cache_entry PERL_EXECUTABLE PATH $optarg
+            ;;
         --with-libmagic=*)
             append_cache_entry LibMagic_ROOT_DIR PATH $optarg
             ;;
@@ -166,6 +182,19 @@ while [ $# -ne 0 ]; do
         --with-perftools=*)
             append_cache_entry GooglePerftools_ROOT_DIR PATH $optarg
             ;;
+        --with-python=*)
+            append_cache_entry PYTHON_EXECUTABLE    PATH    $optarg
+            ;;
+        --with-python-lib=*)
+            append_cache_entry PYTHON_LIBRARY       PATH    $optarg
+            ;;
+        --with-python-inc=*)
+            append_cache_entry PYTHON_INCLUDE_DIR   PATH    $optarg
+            append_cache_entry PYTHON_INCLUDE_PATH  PATH    $optarg
+            ;;
+        --with-swig=*)
+            append_cache_entry SWIG_EXECUTABLE      PATH    $optarg
+            ;;
         --ignore-dirs=*)
             append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING $optarg
             ;;