diff --git a/CHANGES b/CHANGES
index cb1c0c84ca..4d9149c9db 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-41 | 2019-01-04 17:50:00 -0600
+
+  * Replace some bro.org usages with zeek.org (Jon Siwek, Corelight)
+
 2.6-39 | 2019-01-02 11:26:27 -0600
 
   * Add BIF: Reporter::fatal_error_with_core (Stephen Hosom)
diff --git a/VERSION b/VERSION
index 5477c31699..e6ca8ab65f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-39
+2.6-41
diff --git a/doc/cluster/index.rst b/doc/cluster/index.rst
index 5601463144..93dd03d6d3 100644
--- a/doc/cluster/index.rst
+++ b/doc/cluster/index.rst
@@ -169,7 +169,7 @@ same interface.  This allows you to easily take advantage of multiple
 cores in a single physical host because Bro's main event loop is single
 threaded and can't natively utilize all of the cores.  If you want to use
 PF_RING, see the documentation on `how to configure Bro with PF_RING
-<http://bro.org/documentation/load-balancing.html>`_.
+<https://www.zeek.org/documentation/load-balancing.html>`_.
 
 Netmap
 ^^^^^^
diff --git a/doc/components/index.rst b/doc/components/index.rst
index 2f69b3ef54..ca269cd17b 100644
--- a/doc/components/index.rst
+++ b/doc/components/index.rst
@@ -6,7 +6,7 @@ Subcomponents
 The following are snapshots of documentation for components that come
 with this version of Bro (|version|). Since they can also be used
 independently, see the `download page
-<http://bro.org/download/index.html>`_ for documentation of any
+<http://www.zeek.org/download/index.html>`_ for documentation of any
 current, independent component releases.
 
 .. toctree::
diff --git a/doc/install/install.rst b/doc/install/install.rst
index ecc24671c3..5901a4c605 100644
--- a/doc/install/install.rst
+++ b/doc/install/install.rst
@@ -4,7 +4,7 @@
 .. _MacPorts: http://www.macports.org
 .. _Fink: http://www.finkproject.org
 .. _Homebrew: http://brew.sh
-.. _bro downloads page: https://www.bro.org/download/index.html
+.. _downloads page: https://www.zeek.org/download/index.html
 
 .. _installing-bro:
 
@@ -127,7 +127,7 @@ code forms.
 Using Pre-Built Binary Release Packages
 ---------------------------------------
 
-See the `bro downloads page`_ for currently supported/targeted
+See the `downloads page`_ for currently supported/targeted
 platforms for binary releases and for installation instructions.
 
 * Linux Packages
@@ -143,7 +143,7 @@ Installing from Source
 ----------------------
 
 Bro releases are bundled into source packages for convenience and are
-available on the `bro downloads page`_.
+available on the `downloads page`_.
 
 Alternatively, the latest Bro development version
 can be obtained through git repositories
@@ -183,7 +183,7 @@ standard prefixes for binary Bro packages to be installed, so those are
 typically not good choices unless you are creating such a package.
 
 OpenBSD users, please see our `FAQ
-<https://www.bro.org/documentation/faq.html>`_ if you are having
+<https://www.zeek.org/documentation/faq.html>`_ if you are having
 problems installing Bro.
 
 Depending on the Bro package you downloaded, there may be auxiliary
diff --git a/doc/quickstart/index.rst b/doc/quickstart/index.rst
index d7e0491501..bfad960726 100644
--- a/doc/quickstart/index.rst
+++ b/doc/quickstart/index.rst
@@ -1,5 +1,5 @@
 
-.. _FAQ: //www.bro.org/documentation/faq.html
+.. _FAQ: https://www.zeek.org/documentation/faq.html
 
 .. _quickstart:
 
diff --git a/scripts/base/frameworks/cluster/main.bro b/scripts/base/frameworks/cluster/main.bro
index 4c7f806131..c23a123cfd 100644
--- a/scripts/base/frameworks/cluster/main.bro
+++ b/scripts/base/frameworks/cluster/main.bro
@@ -144,7 +144,7 @@ export {
 		## The node type doing all the actual traffic analysis.
 		WORKER,
 		## A node acting as a traffic recorder using the
-		## `Time Machine <http://bro.org/community/time-machine.html>`_
+		## `Time Machine <https://www.zeek.org/community/time-machine.html>`_
 		## software.
 		TIME_MACHINE,
 	};
diff --git a/src/util.h b/src/util.h
index cdba01a9a0..232275d9c9 100644
--- a/src/util.h
+++ b/src/util.h
@@ -88,7 +88,7 @@ typedef int32 ptr_compat_int;
 #define PRI_PTR_COMPAT_INT PRId32
 #define PRI_PTR_COMPAT_UINT PRIu32
 #else
-# error "Unusual pointer size. Please report to bro@bro.org."
+# error "Unsupported pointer size."
 #endif
 
 extern "C"
diff --git a/testing/external/commit-hash.zeek-testing b/testing/external/commit-hash.zeek-testing
index be621c8dee..fc82db5253 100644
--- a/testing/external/commit-hash.zeek-testing
+++ b/testing/external/commit-hash.zeek-testing
@@ -1 +1 @@
-9ed8850017c9d252435f643bf0b1b1148e1256f2
+42fd25c235d0c10319c3597d23f113dbbd89567f
diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private
index 004435b2f8..28110e311a 100644
--- a/testing/external/commit-hash.zeek-testing-private
+++ b/testing/external/commit-hash.zeek-testing-private
@@ -1 +1 @@
-6d1f5cee3efeff72f077dd087603a88fc61f8136
+e71c2dc19eabc68f590381f52a53a207f3b92f78