diff --git a/plugins/Internet/plugin.py b/plugins/Internet/plugin.py
index eb5354394..de94afcd9 100644
--- a/plugins/Internet/plugin.py
+++ b/plugins/Internet/plugin.py
@@ -149,12 +149,22 @@ class Internet(callbacks.Plugin):
 
         Returns the hexadecimal IP for that IP.
         """
-        quads = ip.split('.')
         ret = ""
-        for quad in quads:
-            i = int(quad)
-            ret += '%02x' % i
-        irc.reply(ret.upper())
+        if utils.net.isIPV4(ip):
+            quads = ip.split('.')
+            for quad in quads:
+                i = int(quad)
+                ret += '%02X' % i
+        else:
+            octets = ip.split(':')
+            for octet in octets:
+                if octet:
+                    i = int(octet, 16)
+                    ret += '%04X' % i
+                else:
+                    missing = (8 - len(octets)) * 4
+                    ret += '0' * missing
+        irc.reply(ret)
     hexip = wrap(hexip, ['ip'])