diff --git a/Changes b/Changes
index 429856f89..9ef6b510a 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version 1.8 - SVN
 4/15  F Fixed os_info to backup its database on Windows                  [  #00]
 4/15  F Fixed a potential crash in cs_clear ops                          [#1154]
 4/16  F Fixed missing TS6SID on FJOIN in inspircd12                      [  #00]
+4/19  F Fixed ns_info to show nick expire times to opers not only admins [  #00]
 
 Anope Version 1.8.4
 -------------------
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index afc4edf95..7f04273a4 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -264,7 +264,7 @@ int do_info(User * u)
             if (na->status & NS_NO_EXPIRE) {
                 notice_lang(s_NickServ, u, NICK_INFO_NO_EXPIRE);
             } else {
-                if (is_services_admin(u)) {
+                if (is_servadmin) {
                     expt = na->last_seen + NSExpire;
                     tm = localtime(&expt);
                     strftime_lang(buf, sizeof(buf), na->u,
diff --git a/version.log b/version.log
index f87a4c79b..4057d429f 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,11 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="4"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2896"
+VERSION_BUILD="2900"
 
 # $Log$ # Changes since the 1.8.4 Release
+#Revision 2900 - Fixed /ns info to show when a nick expires to services opers, not only admins
+#Revision 2899 - Fixed missing SID on FJOIN in InspIRCd12 protocol module
 #Revision 2896 - Fixed bug #1153 - Always save channel topics internally, even if the new topic matches the last saved topic
 #Revision 2895 - Fixed bug #1154 - Fixed a potential crash in cs_clear ops
 #Revision 2894 - Check if a command routine exists before all command calls