diff -c -r -N irc2.8.21+CSr5/include/patchlevel.h irc2.8.21+CSr6/include/patchlevel.h
*** irc2.8.21+CSr5/include/patchlevel.h	Sat Jun 24 17:33:01 1995
--- irc2.8.21+CSr6/include/patchlevel.h	Fri Jul  7 04:56:34 1995
***************
*** 17,21 ****
   */
  
  #ifndef	PATCHLEVEL
! #define PATCHLEVEL "2.8.21+CSr5"
  #endif
--- 17,21 ----
   */
  
  #ifndef	PATCHLEVEL
! #define PATCHLEVEL "2.8.21+CSr6"
  #endif
diff -c -r -N irc2.8.21+CSr5/ircd/s_serv.c irc2.8.21+CSr6/ircd/s_serv.c
*** irc2.8.21+CSr5/ircd/s_serv.c	Sun Jul  2 23:25:41 1995
--- irc2.8.21+CSr6/ircd/s_serv.c	Fri Jul  7 04:55:44 1995
***************
*** 1742,1747 ****
--- 1742,1749 ----
                  *(host++) = '\0';
                  if (!*host)
                          host = "*";
+ 		if (*user == '~')
+ 			user++;
                  if (*user != '*')
                          strcpy(tempuser, "*");
                  else
***************
*** 1760,1771 ****
                  if (!(acptr = find_chasing(sptr, parv[1], NULL)))
                          return 0;
                  strcpy(tempuser, "*");
!                 strcat(tempuser, acptr->user->username);
                  user = tempuser;
                  host = cluster(acptr->user->host);
          }
- 	if (*user == '~')
- 		user++;
          if (!matches(user, "akjhfkahfasfjd") &&
                  !matches(host, "ldksjfl.ksskdjfd.jfklsjf"))
          {
--- 1762,1774 ----
                  if (!(acptr = find_chasing(sptr, parv[1], NULL)))
                          return 0;
                  strcpy(tempuser, "*");
! 		if (*acptr->user->username == '~')
! 			strcat(tempuser, (char *)acptr->user->username+1);
! 		else
! 	                strcat(tempuser, acptr->user->username);
                  user = tempuser;
                  host = cluster(acptr->user->host);
          }
          if (!matches(user, "akjhfkahfasfjd") &&
                  !matches(host, "ldksjfl.ksskdjfd.jfklsjf"))
          {