diff --git a/ChangeLog b/ChangeLog
index c7430f9..cfd19af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ Symbols are:
 (F)	- Fish (fish@dynam.ac)
 (S)	- Shmad (shmad@neostats.net)
 (HP)	- Hybrid Team Patches to Hybrid Source
+* NeoIRCd Version 0.9.5 - 12th Oct, 2002 - Fish
+(F)	- Fixed up Server info lines not being propogated correctly
+(F)	- fixed up m_message.so so that opers/services can send to anyhost with /msg $$* (For operserv global compat)
+
 
 * NeoIRCd Version 0.9.4 - 24th Sept, 2002 - Fish
 (S)     - Fixed up event.c for a possible serious bug reported by Dianora from hybrid team
diff --git a/include/patchlevel.h b/include/patchlevel.h
index 32f721e..b126205 100644
--- a/include/patchlevel.h
+++ b/include/patchlevel.h
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: patchlevel.h,v 1.6 2002/09/24 13:25:28 fishwaldo Exp $
+ *  $Id: patchlevel.h,v 1.7 2002/10/15 02:44:33 fishwaldo Exp $
  */
 
 #ifndef PATCHLEVEL
-#define PATCHLEVEL   "NeoIRCd 0.9.4"
+#define PATCHLEVEL   "NeoIRCd 0.9.5"
 #endif
diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 7c2467c..4b08d62 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_message.c,v 1.9 2002/09/24 13:25:28 fishwaldo Exp $
+ *  $Id: m_message.c,v 1.10 2002/10/15 02:44:33 fishwaldo Exp $
  */
 
 #include "stdinc.h"
@@ -122,7 +122,7 @@ _moddeinit(void)
   mod_del_cmd(&notice_msgtab);
 }
 
-const char *_version = "$Revision: 1.9 $";
+const char *_version = "$Revision: 1.10 $";
 #endif
 
 /*
@@ -814,7 +814,10 @@ handle_opers(int p_or_n, char *command, struct Client *client_p,
 		 me.name, source_p->name, command, nick, nick);
       return;
     }
-      
+
+    /* we allow it to send messages to anybody */
+
+#if 0      
     if ((s = strrchr(nick, '.')) == NULL)
     {
       sendto_one(source_p, form_str(ERR_NOTOPLEVEL),
@@ -830,7 +833,7 @@ handle_opers(int p_or_n, char *command, struct Client *client_p,
                  me.name, source_p->name, nick);
       return;
     }
-    
+#endif    
     sendto_match_butone(IsServer(client_p) ? client_p : NULL, source_p,
                         nick + 1,
                         (*nick == '#') ? MATCH_HOST : MATCH_SERVER,
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 604a364..de439df 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_server.c,v 1.8 2002/09/20 09:05:18 fishwaldo Exp $
+ *  $Id: m_server.c,v 1.9 2002/10/15 02:44:33 fishwaldo Exp $
  */
 
 #include "stdinc.h"
@@ -67,7 +67,7 @@ _moddeinit(void)
 {
   mod_del_cmd(&server_msgtab);
 }
-const char *_version = "$Revision: 1.8 $";
+const char *_version = "$Revision: 1.9 $";
 #endif
 
 int bogus_host(char *host);
@@ -254,7 +254,6 @@ static void mr_server(struct Client *client_p, struct Client *source_p,
   client_p->flags &= ~FLAGS_ULINED;
   if (srvopt & SERVER_HIDDEN) client_p->hidden_server = 1;
   set_server_gecos(client_p, info);
-  
   /* if this server is trying to set itself Ulined, its Not allowed, so exit it */
   if (srvopt & SERVER_ULINED) {
   	sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_ALL, "Server %s trying to U line itself. No Way, Nadda, I dun think so", client_p->name);
@@ -597,9 +596,6 @@ static int set_server_gecos(struct Client *client_p, char *info)
      * it isnt \0 */
     if(s && (*s != '\0'))
     {
-      /* a space? if not (H) could be the last part of info.. */
-      if((p = strchr(s, ' ')))
-        *p = '\0';
       
       /* if there was a trailing space, s could point to \0, so check */
       if(s && (*s != '\0'))