diff --git a/CHANGES b/CHANGES
index 7df64d707..3eafb7184 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,7 @@ TRUNK
 ## Removed
 
 - Lua 5.1 support
+- XEP-0090 support removed from mod_time
 
 0.12.0
 ======
diff --git a/doc/doap.xml b/doc/doap.xml
index 933762686..2bddedd58 100644
--- a/doc/doap.xml
+++ b/doc/doap.xml
@@ -241,7 +241,8 @@
         <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0090.html"/>
         <xmpp:version>1.2</xmpp:version>
         <xmpp:since>0.1.0</xmpp:since>
-        <xmpp:status>complete</xmpp:status>
+        <xmpp:until>trunk</xmpp:until>
+        <xmpp:status>removed</xmpp:status>
         <xmpp:note>mod_time</xmpp:note>
       </xmpp:SupportedXep>
     </implements>
diff --git a/plugins/mod_time.lua b/plugins/mod_time.lua
index 72421f85a..c91977999 100644
--- a/plugins/mod_time.lua
+++ b/plugins/mod_time.lua
@@ -9,7 +9,6 @@
 local st = require "util.stanza";
 local datetime = require "util.datetime".datetime;
 local now = require "util.time".now;
-local legacy = require "util.datetime".legacy;
 
 -- XEP-0202: Entity Time
 
@@ -26,16 +25,3 @@ end
 module:hook("iq-get/bare/urn:xmpp:time:time", time_handler);
 module:hook("iq-get/host/urn:xmpp:time:time", time_handler);
 
--- XEP-0090: Entity Time (deprecated)
-
-module:add_feature("jabber:iq:time");
-
-local function legacy_time_handler(event)
-	local origin, stanza = event.origin, event.stanza;
-	origin.send(st.reply(stanza):tag("query", {xmlns="jabber:iq:time"})
-		:tag("utc"):text(legacy()));
-	return true;
-end
-
-module:hook("iq-get/bare/jabber:iq:time:query", legacy_time_handler);
-module:hook("iq-get/host/jabber:iq:time:query", legacy_time_handler);