diff --git a/ChangeLog b/ChangeLog
index 1d8c61bc..4a7fc85b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+jilles      2007/03/28 14:49:48 UTC	(20070328-3297)
+  Log:
+  Merge old trunk r2779,r2785:
+  Show correct privilege name in a few ERR_NOPRIVS numerics.
+  
+
+  Changes:	Modified:
+  +1 -1		trunk/extensions/m_ojoin.c (File Modified) 
+  +1 -1		trunk/extensions/m_opme.c (File Modified) 
+  +2 -2		trunk/unsupported/m_force.c (File Modified) 
+
+
 jilles      2007/03/28 14:45:46 UTC	(20070328-3295)
   Log:
   Merge old trunk r2695:
diff --git a/include/serno.h b/include/serno.h
index 90085ad4..aec2fcbe 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070328-3295"
+#define SERNO "20070328-3297"
diff --git a/modules/m_whois.c b/modules/m_whois.c
index c139c293..9d9490af 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_whois.c 3287 2007-03-28 13:49:57Z jilles $
+ *  $Id: m_whois.c 3299 2007-03-28 14:54:10Z jilles $
  */
 
 #include "stdinc.h"
@@ -67,7 +67,7 @@ mapi_hlist_av1 whois_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3287 $");
+DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3299 $");
 
 /*
  * m_whois
@@ -210,7 +210,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 	else
 		sendto_one_numeric(source_p, ERR_NOSUCHNICK,
 				   form_str(ERR_NOSUCHNICK), 
-				   IsDigit(*nick) ? "*" : nick);
+				   nick);
 
 	sendto_one_numeric(source_p, RPL_ENDOFWHOIS, 
 			   form_str(RPL_ENDOFWHOIS), parv[1]);