diff --git a/ReferenceOfClasses.md b/ReferenceOfClasses.md
index 687e4a28..d26aed04 100644
--- a/ReferenceOfClasses.md
+++ b/ReferenceOfClasses.md
@@ -68,7 +68,7 @@ Keys
 ----
 * `get_keys()`: list of `UserKey`
 * `get_key( id )`: `UserKey`
-* `create_key()`: `UserKey`
+* `create_key( title, key )`: `UserKey`
 
 Followers
 ---------
@@ -714,7 +714,7 @@ Keys
 ----
 * `get_keys()`: list of `RepositoryKey`
 * `get_key( id )`: `RepositoryKey`
-* `create_key()`: `RepositoryKey`
+* `create_key( title, key )`: `RepositoryKey`
 
 Collaborators
 -------------
@@ -817,10 +817,14 @@ Class `RepositoryKey`
 
 Attributes
 ----------
+* `url`
+* `id`
+* `title`
+* `key`
 
 Modification
 ------------
-* `edit()`
+* `edit( title, key )`
 
 Deletion
 --------
@@ -881,10 +885,14 @@ Class `UserKey`
 
 Attributes
 ----------
+* `url`
+* `id`
+* `title`
+* `key`
 
 Modification
 ------------
-* `edit()`
+* `edit( title, key )`
 
 Deletion
 --------
diff --git a/github/GithubObjects.py b/github/GithubObjects.py
index 051800cb..b0dca1b0 100644
--- a/github/GithubObjects.py
+++ b/github/GithubObjects.py
@@ -18,9 +18,9 @@ UserKey = GithubObject(
     "UserKey",
     BaseUrl( lambda obj: "/user/keys/" + str( obj.id ) ),
     InternalSimpleAttributes(
-        ### @todo
+        "url", "id", "title", "key",
     ),
-    Editable( [], [] ), ### @todo
+    Editable( [ "title", "key" ], [] ),
     Deletable(),
 )
 
@@ -50,7 +50,7 @@ AuthenticatedUser = GithubObject(
     ExternalListOfObjects( "keys", "key", UserKey,
         ListGetable( [], [] ),
         ElementGetable( [ "id" ], [] ),
-        ElementCreatable( [], [] ), ### @todo
+        ElementCreatable( [ "title", "key" ], [] ),
     ),
 )
 
@@ -373,10 +373,10 @@ RepositoryKey = GithubObject(
     "RepositoryKey",
     BaseUrl( lambda obj: obj._repo._baseUrl + "/keys/" + str( obj.id ) ),
     InternalSimpleAttributes(
-        ### @todo
+        "url", "id", "title", "key",
         "_repo", ### Ugly hack
     ),
-    Editable( [], [] ), ### @todo
+    Editable( [ "title", "key" ], [] ),
     Deletable()
 )
 
@@ -412,7 +412,7 @@ Repository._addAttributePolicy( SeveralAttributePolicies( [
     ExternalListOfObjects( "keys", "key", RepositoryKey,
         ListGetable( [], [] ),
         ElementGetable( [ "id" ], [], __modifyAttributesForObjectsReferingRepo ),
-        ElementCreatable( [], [] ), ### @todo
+        ElementCreatable( [ "title", "key" ], [] ),
     ),
     ExternalListOfObjects( "collaborators", "collaborator", NamedUser,
         ListGetable( [], [] ),