diff --git a/ChangeLog b/ChangeLog
index bae00fe2..826086ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+jilles      2007/07/14 21:50:21 UTC	(20070714-3536)
+  Log:
+  In a two-argument whois, RPL_ENDOFWHOIS should show second arg.
+  This already works correctly for successful/notfound case.
+  
+
+  Changes:	Modified:
+  +1 -1		trunk/modules/m_whois.c (File Modified) 
+
+
 jilles      2007/07/14 13:34:50 UTC	(20070714-3534)
   Log:
   Use mask_match() to check bans from local clients for
diff --git a/include/irc_string.h b/include/irc_string.h
index bfb69424..3dd83530 100644
--- a/include/irc_string.h
+++ b/include/irc_string.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: irc_string.h 3532 2007-07-14 13:32:18Z jilles $
+ *  $Id: irc_string.h 3538 2007-07-26 14:21:57Z jilles $
  */
 
 #ifndef INCLUDED_irc_string_h
@@ -131,7 +131,7 @@ char *strip_tabs(char *dest, const unsigned char *src, size_t len);
 
 const char *myctime(time_t);
 
-#define EmptyString(x) (!(x) || (*(x) == '\0'))
+#define EmptyString(x) ((x) == NULL || *(x) == '\0')
 #define CheckEmpty(x) EmptyString(x) ? "" : x
 
 char *strtoken(char **save, char *str, const char *fs);
diff --git a/include/serno.h b/include/serno.h
index b6eeae68..45500c7f 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070714-3534"
+#define SERNO "20070714-3536"