diff --git a/src/client/ClientDataResolver.js b/src/client/ClientDataResolver.js
index ab043c1f7..04d6b0b01 100644
--- a/src/client/ClientDataResolver.js
+++ b/src/client/ClientDataResolver.js
@@ -84,7 +84,7 @@ class ClientDataResolver {
    * Data that resolves to give a GuildMember object. This can be:
    * * A GuildMember object
    * * A User object
-   * @typedef {Guild} GuildMemberResolvable
+   * @typedef {GuildMember|User} GuildMemberResolvable
    */
 
   /**
diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index 99ac59b5b..d238258a6 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -312,7 +312,7 @@ class Guild {
   }
 
   /**
-   * The `@everyone` Role of the guild
+   * The `@everyone` role of the guild
    * @type {Role}
    * @readonly
    */
@@ -320,6 +320,15 @@ class Guild {
     return this.roles.get(this.id);
   }
 
+  /**
+   * The client user as a GuildMember of this guild
+   * @type {?GuildMember}
+   * @readonly
+   */
+  get me() {
+    return this.members.get(this.client.user.id);
+  }
+
   /**
    * Fetches a collection of roles in the current guild sorted by position
    * @type {Collection<Snowflake, Role>}