diff --git a/CHANGES b/CHANGES
index 8372329d0e..54858ea180 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.0-beta-21 | 2011-11-06 19:27:22 -0800
+
+  * Quickstart doc fixes. (Jon Siwek)
+
 2.0-beta-19 | 2011-11-03 17:41:00 -0700
 
   * Fixing packet filter test. (Robin Sommer)
diff --git a/VERSION b/VERSION
index ce0cb3814c..c7a306b6f3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0-beta-19
+2.0-beta-21
diff --git a/aux/binpac b/aux/binpac
index e0b7d838c1..777b8a21c4 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit e0b7d838c10da57d09a6645a64ee6fee47e0507d
+Subproject commit 777b8a21c4c74e1f62e8b9896b082e8c059b539f
diff --git a/aux/bro-aux b/aux/bro-aux
index c876be28ab..906f970df5 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit c876be28ab59a663ace668b63b14dc39936199df
+Subproject commit 906f970df5f708582c7002069b787d5af586b46f
diff --git a/aux/broccoli b/aux/broccoli
index 1553a19a55..e02e3cc89a 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 1553a19a559765989d7c0297e357f0402dff1a69
+Subproject commit e02e3cc89a3efb3d7ec376154e24835b4b828be8
diff --git a/aux/broctl b/aux/broctl
index 32ffde0e08..288c8568d7 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 32ffde0e08d7f33aa20954755586174b4aa041c9
+Subproject commit 288c8568d7aaa38cf7c05833c133a91cbadbfce4
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 7a6caf71dd..22523e1618 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -126,7 +126,7 @@ and sendmail for sending emails.
   against them.
 
 Additional steps may be needed to `get the right GeoIP database
-<geoip.html>`_.
+<{{git('bro:doc/geoip.rst')}}>`_.
 
 Compiling Bro Source Code
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -441,7 +441,7 @@ that only takes the email action for SSH logins to a defined set of servers:
     } &redef;
 
     redef Notice::policy += {
-        [$result = Notice::ACTION_EMAIL,
+        [$action = Notice::ACTION_EMAIL,
          $pred(n: Notice::Info) =
             {
             return n$note == SSH::Login && n$id$resp_h in watched_servers;