diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl
index f1e15881..c19d4a6b 100644
--- a/client/views/actions/whois.tpl
+++ b/client/views/actions/whois.tpl
@@ -6,11 +6,11 @@
 {{/if}}
 
 	<dt>Host mask:</dt>
-	<dd class="hostmask">{{whois.user}}@{{whois.host}}</dd>
+	<dd class="hostmask">{{whois.ident}}@{{whois.hostname}}</dd>
 
-{{#if whois.actualhost}}
+{{#if whois.actual_hostname}}
 	<dt>Actual host:</dt>
-	<dd class="hostmask"><a href="https://ipinfo.io/{{whois.actualip}}" target="_blank" rel="noopener">{{whois.actualip}}</a>{{#notEqual whois.actualhost whois.actualip}} ({{whois.actualhost}}){{/notEqual}}</dd>
+	<dd class="hostmask"><a href="https://ipinfo.io/{{whois.actual_ip}}" target="_blank" rel="noopener">{{whois.actual_ip}}</a>{{#notEqual whois.actual_hostname whois.actual_ip}} ({{whois.actual_hostname}}){{/notEqual}}</dd>
 {{/if}}
 
 {{#if whois.real_name}}
diff --git a/package.json b/package.json
index 03197b69..7dee31fe 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "express": "4.16.3",
     "filenamify": "2.1.0",
     "fs-extra": "6.0.1",
-    "irc-framework": "2.11.0",
+    "irc-framework": "3.0.0",
     "linkify-it": "2.0.3",
     "lodash": "4.17.10",
     "mime-types": "2.1.18",
diff --git a/src/plugins/irc-events/chghost.js b/src/plugins/irc-events/chghost.js
index b6e458fa..0be9d775 100644
--- a/src/plugins/irc-events/chghost.js
+++ b/src/plugins/irc-events/chghost.js
@@ -19,7 +19,7 @@ module.exports = function(irc, network) {
 				time: data.time,
 				type: Msg.Type.CHGHOST,
 				new_ident: data.ident !== data.new_ident ? data.new_ident : "",
-				new_host: data.hostname !== data.new_host ? data.new_host : "",
+				new_host: data.hostname !== data.new_hostname ? data.new_hostname : "",
 				self: data.nick === irc.user.nick,
 				from: user,
 			});
diff --git a/yarn.lock b/yarn.lock
index 5b002745..924c8e8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3590,14 +3590,15 @@ ipaddr.js@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
 
-irc-framework@2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/irc-framework/-/irc-framework-2.11.0.tgz#3d2cc98c5244f04a3046ebac4a65485b744d4b14"
+irc-framework@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/irc-framework/-/irc-framework-3.0.0.tgz#01eada23bc73e4a93274ac1a14f5a65081f2b30c"
   dependencies:
     eventemitter3 "^2.0.2"
     iconv-lite "^0.4.11"
     lodash "^4.17.4"
     middleware-handler "^0.2.0"
+    runes "^0.4.3"
     socksjs "^0.5.0"
 
 is-absolute-url@^2.0.0:
@@ -6264,6 +6265,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
+runes@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/runes/-/runes-0.4.3.tgz#32f7738844bc767b65cc68171528e3373c7bb355"
+
 rx-lite-aggregates@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"