diff --git a/Changes b/Changes
index 552e3c385..ae814c483 100644
--- a/Changes
+++ b/Changes
@@ -201,3 +201,4 @@
 - Fixed a /map problem
 - Updated doc/conf.doc and doc/example.conf
 - Fixed a bug where /map showed U:lines while HIDE_ULINES was set
+- Removed "on network" in /whois oper
\ No newline at end of file
diff --git a/src/s_err.c b/src/s_err.c
index 84557e171..6bdfd5459 100644
--- a/src/s_err.c
+++ b/src/s_err.c
@@ -346,7 +346,7 @@ static char *replies[] = {
 /* 310    RPL_WHOISHELPOP */ ":%s 310 %s %s :is available for help.",
 /* 311    RPL_WHOISUSER */ ":%s 311 %s %s %s %s * :%s",
 /* 312    RPL_WHOISSERVER */ ":%s 312 %s %s %s :%s",
-/* 313    RPL_WHOISOPERATOR */ ":%s 313 %s %s :is %s on %s",
+/* 313    RPL_WHOISOPERATOR */ ":%s 313 %s %s :is %s",
 /* 314    RPL_WHOWASUSER */ ":%s 314 %s %s %s %s * :%s",
 /* 315    RPL_ENDOFWHO */ ":%s 315 %s %s :End of /WHO list.",
 /* 316 */ NULL, /* Used */
diff --git a/src/s_user.c b/src/s_user.c
index 6b7d13170..7abb762bd 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -2811,7 +2811,7 @@ int  m_whois(cptr, sptr, parc, parv)
 				if (buf[0])
 					sendto_one(sptr,
 					    rpl_str(RPL_WHOISOPERATOR), me.name,
-					    parv[0], name, buf, ircnetwork);
+					    parv[0], name, buf);
 			}
 
 			if (IsHelpOp(acptr) && (!IsHideOper(acptr) || sptr == acptr || IsAnOper(sptr)))
diff --git a/src/ssl.rnd b/src/ssl.rnd
index b911b7f1b..7178b2d06 100644
Binary files a/src/ssl.rnd and b/src/ssl.rnd differ