diff -uNr ircservices-5.0.51/Changes ircservices-5.0.52/Changes
--- ircservices-5.0.51/Changes	2005-04-03 09:39:38 +0900
+++ ircservices-5.0.52/Changes	2005-05-12 12:03:27 +0900
@@ -1,5 +1,11 @@
 Version 5.0
 -----------
+2005/05/12 .52	Fixed occasional corruption of the NickServ REGISTER syntax
+		    string upon reconfiguration (OperServ REHASH).
+		    Reported by <alm@woodnet.ru>
+2005/05/06	Fixed attempts to send PING messages before connecting to
+		    the server.  Reported by Craig McLure
+		    <Craig@chatspike.net>
 2005/04/02 .51	convert-db now checks for more potential problems with the
 		    imported databases before writing out the XML data.
 2005/04/02	Fixed bugs when converting databases from old versions of
diff -uNr ircservices-5.0.51/main.c ircservices-5.0.52/main.c
--- ircservices-5.0.51/main.c	2005-04-03 10:17:16 +0900
+++ ircservices-5.0.52/main.c	2005-05-12 12:19:45 +0900
@@ -229,6 +229,7 @@
 
 
     /* Set up timers. */
+    last_send   = time(NULL);
     last_update = time(NULL);
     last_check  = time(NULL);
 
@@ -255,7 +256,7 @@
 	    break;
 
 	if (sock_isconn(servsock)) {
-	    if (PingFrequency && now-last_send >= PingFrequency)
+	    if (PingFrequency && now - last_send >= PingFrequency)
 		send_cmd(NULL, "PING :%s", ServerName);
 	}
 
diff -uNr ircservices-5.0.51/modules/chanserv/check.c ircservices-5.0.52/modules/chanserv/check.c
--- ircservices-5.0.51/modules/chanserv/check.c	2005-04-03 10:17:17 +0900
+++ ircservices-5.0.52/modules/chanserv/check.c	2005-05-12 12:19:46 +0900
@@ -243,7 +243,7 @@
     char chan[CHANMAX];
     Timeout *to;
 };
-CSInhabitData *inhabit_list = NULL;
+static CSInhabitData *inhabit_list = NULL;
 
 
 /* Tiny helper routine to get ChanServ out of a channel after it went in. */
diff -uNr ircservices-5.0.51/modules/nickserv/main.c ircservices-5.0.52/modules/nickserv/main.c
--- ircservices-5.0.51/modules/nickserv/main.c	2005-04-03 10:17:17 +0900
+++ ircservices-5.0.52/modules/nickserv/main.c	2005-05-12 12:19:46 +0900
@@ -1793,8 +1793,8 @@
 	    setstring(NICK_HELP_UNSET, NICK_HELP_UNSET_REQ_EMAIL);
 	} else {
 	    setstring(NICK_REGISTER_SYNTAX, old_REGISTER_SYNTAX);
-	    setstring(NICK_REGISTER_SYNTAX, old_HELP_REGISTER_EMAIL);
-	    setstring(NICK_REGISTER_SYNTAX, old_HELP_UNSET);
+	    setstring(NICK_HELP_REGISTER_EMAIL, old_HELP_REGISTER_EMAIL);
+	    setstring(NICK_HELP_UNSET, old_HELP_UNSET);
 	}
 	if (NSForceNickChange) {
 	    setstring(DISCONNECT_IN_1_MINUTE, FORCENICKCHANGE_IN_1_MINUTE);
diff -uNr ircservices-5.0.51/sockets.c ircservices-5.0.52/sockets.c
--- ircservices-5.0.51/sockets.c	2005-04-03 10:17:16 +0900
+++ ircservices-5.0.52/sockets.c	2005-05-12 12:19:45 +0900
@@ -189,9 +189,7 @@
 
 /*************************************************************************/
 
-/* Return whether the given socket is currently connected (this includes
- * sockets which are waiting for a connection to be completed).
- */
+/* Return whether the given socket is currently connected. */
 
 int sock_isconn(const Socket *s)
 {
@@ -200,7 +198,7 @@
 	errno = EINVAL;
 	return 0;
     }
-    return s->flags & (SF_CONNECTING|SF_CONNECTED) ? 1 : 0;
+    return s->flags & SF_CONNECTED ? 1 : 0;
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.51/version.sh ircservices-5.0.52/version.sh
--- ircservices-5.0.51/version.sh	2005-04-03 09:36:10 +0900
+++ ircservices-5.0.52/version.sh	2005-05-12 12:04:01 +0900
@@ -6,7 +6,7 @@
 # $PROGRAM is the string returned as the first part of a /VERSION reply,
 # and must not contain spaces.  It is not used anywhere else.
 PROGRAM=ircservices
-VERSION=5.0.51
+VERSION=5.0.52
 
 # Increment Services build number
 if [ -f version.c ] ; then