diff --git a/.gitmodules b/.gitmodules
index 326e1fe506..12e758c23a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
 [submodule "aux/bro-aux"]
 	path = aux/bro-aux
-	url = git://git.icir.org/bro-aux
+	url = git://git.bro-ids.org/bro-aux
 [submodule "aux/binpac"]
 	path = aux/binpac
-	url = git://git.icir.org/binpac
+	url = git://git.bro-ids.org/binpac
 [submodule "aux/broccoli"]
 	path = aux/broccoli
-	url = git://git.icir.org/broccoli
+	url = git://git.bro-ids.org/broccoli
 [submodule "aux/broctl"]
 	path = aux/broctl
-	url = git://git.icir.org/broctl
+	url = git://git.bro-ids.org/broctl
 [submodule "aux/btest"]
 	path = aux/btest
-	url = git://git.icir.org/btest
+	url = git://git.bro-ids.org/btest
diff --git a/CHANGES b/CHANGES
index bfa5ab77f7..e3f351b03d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+
 1.6-dev.53 Fri Feb 25 17:03:05 PST 2011
 
 - Fixing file detector leak in remote communication module. (Scott
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e048305c8d..3c3cd05d96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,10 @@ endif ()
 get_filename_component(POLICYDIR ${POLICYDIR} ABSOLUTE)
 
 configure_file(bro-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.sh
+     "export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.csh
+     "setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n")
 
 file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1)
 
diff --git a/INSTALL b/INSTALL
index 7692d27966..1220d720ad 100644
--- a/INSTALL
+++ b/INSTALL
@@ -92,6 +92,13 @@ with it. In the following we give a few simple examples.  See the
 quickstart guide at http://www.bro-ids.org for more information; you
 can the source that in doc/quick-start.
 
-For developers that wish to run Bro after performing "make", but
-without performing "make install", see build/bro-path-dev for
-an example.
+For developers that wish to run Bro from the the build/ directory
+after performing "make", but without performing "make install", they
+will have to first set BROPATH to look for scripts inside the build
+directory.  Sourcing either build/bro-path-dev.sh or build/bro-path-dev.csh
+as appropriate for the current shell accomplishes this. e.g.:
+
+    > ./configure
+    > make
+    > source build/bro-path-dev.sh
+    > ./build/src/bro
diff --git a/aux/bro-aux b/aux/bro-aux
index afa0a0d8b3..7e50bac938 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit afa0a0d8b3fdfa5306507948f08ac9f07696eb21
+Subproject commit 7e50bac938af1831ecf9660159145a3c2e77e13d
diff --git a/aux/broccoli b/aux/broccoli
index 2b8a1c9c32..584c8ac840 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 2b8a1c9c32dab2da9ebb54238c1b60e40bb8688f
+Subproject commit 584c8ac840ff89905f8ff45f69c95353e9b09113
diff --git a/aux/broctl b/aux/broctl
index fc940bbb72..a7c00a3610 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit fc940bbb72abbaef2e5f10ea4ab616ec9b61fe0a
+Subproject commit a7c00a361022f2269985dbaaad11197f1a0dc667
diff --git a/aux/btest b/aux/btest
index a2b04952ae..acf25f34ab 160000
--- a/aux/btest
+++ b/aux/btest
@@ -1 +1 @@
-Subproject commit a2b04952ae91dcd27d5e68a42d5d26c291ecb1f5
+Subproject commit acf25f34ab48568f5db919c9e3505ed319daa4e5
diff --git a/bro-path-dev.in b/bro-path-dev.in
index aad1b72dbd..394462924d 100755
--- a/bro-path-dev.in
+++ b/bro-path-dev.in
@@ -1,3 +1,4 @@
+#!/bin/sh
 # After configured by CMake, this file prints the absolute path to policy
 # files that come with the source distributions of Bro and Broctl as well
 # as policy files that are generated by the BIF compiler at compile time
@@ -6,7 +7,7 @@
 # the build directory, avoiding the need to install it.  This could be
 # done like:
 #
-#     BROPATH=`source bro-path-dev` ./src/bro
+#     BROPATH=`./bro-path-dev` ./src/bro
 #
 
 broPolicies=${PROJECT_SOURCE_DIR}/policy:${PROJECT_SOURCE_DIR}/policy/sigs:${PROJECT_SOURCE_DIR}/policy/time-machine