diff --git a/disco/types/guild.py b/disco/types/guild.py
index 5c2a0d7..d72e2f9 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -54,6 +54,8 @@ class GuildEmoji(Emoji):
         Whether this emoji is managed by an integration.
     roles : list(snowflake)
         Roles this emoji is attached to.
+    animated : bool
+        Whether this emoji is animated.
     """
     id = Field(snowflake)
     guild_id = Field(snowflake)
@@ -61,9 +63,10 @@ class GuildEmoji(Emoji):
     require_colons = Field(bool)
     managed = Field(bool)
     roles = ListField(snowflake)
+    animated = Field(bool)
 
     def __str__(self):
-        return u'<:{}:{}>'.format(self.name, self.id)
+        return u'<{}:{}:{}>'.format('a' if self.animated else '', self.name, self.id)
 
     def update(self, **kwargs):
         return self.client.api.guilds_emojis_modify(self.guild_id, self.id, **kwargs)
@@ -73,7 +76,7 @@ class GuildEmoji(Emoji):
 
     @property
     def url(self):
-        return 'https://discordapp.com/api/emojis/{}.png'.format(self.id)
+        return 'https://discordapp.com/api/emojis/{}.{}'.format(self.id, 'gif' if self.animated else 'png')
 
     @cached_property
     def guild(self):
diff --git a/disco/types/message.py b/disco/types/message.py
index dcac07e..b97a5e0 100644
--- a/disco/types/message.py
+++ b/disco/types/message.py
@@ -37,9 +37,12 @@ class Emoji(SlottedModel):
         The emoji ID (will be none if this is not a custom emoji).
     name : str
         The name of this emoji.
+    animated : bool
+        Whether this emoji is animated.
     """
     id = Field(snowflake)
     name = Field(text)
+    animated = Field(bool)
 
     @cached_property
     def custom(self):