diff --git a/CHANGES b/CHANGES
index dce30785ae..a85c4f0847 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.0-623 | 2012-06-15 16:24:52 -0700
+
+  * Changing an error in the input framework to a warning. (Robin
+    Sommer)
+
 2.0-622 | 2012-06-15 15:38:43 -0700
 
   * Input framework updates. (Bernhard Amann)
diff --git a/VERSION b/VERSION
index 51c26b96dc..0fec46f4a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0-622
+2.0-623
diff --git a/aux/binpac b/aux/binpac
index 6f43a8115d..b4094cb75e 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 6f43a8115d8e6483a50957c5d21c5d69270ab3aa
+Subproject commit b4094cb75e0a7769123f7db1f5d73f3f9f1c3977
diff --git a/aux/bro-aux b/aux/bro-aux
index c6391412e9..f938c81ada 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit c6391412e902e896836450ab98910309b2ca2d9b
+Subproject commit f938c81ada94641ab5f0231983edc2ba866b9a1f
diff --git a/aux/broccoli b/aux/broccoli
index 0d139c09d5..4e17842743 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 0d139c09d5a9c8623ecc2a5f395178f0ddcd7e16
+Subproject commit 4e17842743fef8df6abf0588c7ca86c6937a2b6d
diff --git a/aux/broctl b/aux/broctl
index 880f3e48d3..589cb04c3d 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 880f3e48d33bb28d17184656f858a4a0e2e1574c
+Subproject commit 589cb04c3d7e28a81aa07454e2b9b6b092f0e1af
diff --git a/aux/btest b/aux/btest
index 5856453712..4697bf4c80 160000
--- a/aux/btest
+++ b/aux/btest
@@ -1 +1 @@
-Subproject commit 585645371256e8ec028cabae24c5f4a2108546d2
+Subproject commit 4697bf4c8046a3ab7d5e00e926c5db883cb44664
diff --git a/src/input/Manager.cc b/src/input/Manager.cc
index c0b4b04a7c..63fa59d0bc 100644
--- a/src/input/Manager.cc
+++ b/src/input/Manager.cc
@@ -696,8 +696,8 @@ bool Manager::RemoveStream(Stream *i)
 
 	if ( i->removed )
 		{
-		reporter->Error("Stream %s is already queued for removal. Ignoring remove.", i->name.c_str());
-		return false;
+		reporter->Warning("Stream %s is already queued for removal. Ignoring remove.", i->name.c_str());
+		return true;
 		}
 
 	i->removed = true;