diff --git a/CHANGES b/CHANGES
index dc6f034de1..cc361fa4c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,17 @@
 
+2.3-793 | 2015-04-20 20:51:00 -0700
+
+  * Add decoding of PROXY-AUTHORIZATION header to HTTP analyze,
+    treating it the same as AUTHORIZATION. (Josh Liburdi)
+
+  * Remove deprecated fields "hot" and "addl" from the connection
+    record. Remove the functions append_addl() and
+    append_addl_marker(). (Robin Sommer)
+
+  * Removing the NetFlow analyzer, which hasn't been used anymore
+    since then corresponding command-line option went away. (Robin
+    Sommer)
+
 2.3-787 | 2015-04-20 19:15:23 -0700
 
   * A file analyzer for Portable Executables. (Vlad Grigorescu/Seth
diff --git a/NEWS b/NEWS
index b8a75687ae..c42145c9d2 100644
--- a/NEWS
+++ b/NEWS
@@ -188,6 +188,10 @@ Changed Functionality
 - The capability of processing NetFlow input has been removed for the
   time being.
 
+- The deprecated fields "hot" and "addl" have been removed from the
+  connection record. Likewise, the functions append_addl() and
+  append_addl_marker() have been removed.
+
 Deprecated Functionality
 ------------------------
 
diff --git a/VERSION b/VERSION
index 03bf07bad6..ed37397383 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-787
+2.3-793
diff --git a/scripts/base/protocols/http/main.bro b/scripts/base/protocols/http/main.bro
index 67ab88300e..916723ebcb 100644
--- a/scripts/base/protocols/http/main.bro
+++ b/scripts/base/protocols/http/main.bro
@@ -266,7 +266,7 @@ event http_header(c: connection, is_orig: bool, name: string, value: string) &pr
 				add c$http$proxied[fmt("%s -> %s", name, value)];
 				}
 
-		else if ( name == "AUTHORIZATION" )
+		else if ( name == "AUTHORIZATION" || name == "PROXY-AUTHORIZATION" )
 			{
 			if ( /^[bB][aA][sS][iI][cC] / in value )
 				{