diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 9e4e40a..11192c1 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-11 Erik Smit <zoiah@zoiah.net>
+
+	* vtysh.c: (vtysh_config_from_file) fix regression from
+	  a previous cleanup, vtysh_client.flags and cmd->daemon are
+	  bitwise flags, bitwise & was meant to be used. Fixes breakage
+	  of integrated config file reading.
+
 2005-09-15 Hasso Tepper <hasso at quagga.net>
 
 	* vtysh.c: Fix warning by casting rl_bind_key 2. argument correctly.
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index fa48a44..08ed749 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -523,7 +523,7 @@
 
 	    for (i = 0; i < VTYSH_INDEX_MAX; i++)
 	      {
-	        if (cmd->daemon && vtysh_client[i].flag)
+	        if (cmd->daemon & vtysh_client[i].flag)
 		  {
 		    cmd_stat = vtysh_client_execute (&vtysh_client[i],
 						     vty->buf, stdout);