diff --git a/CHANGELOG.md b/CHANGELOG.md
index d55ce4a5..991d83f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,7 +38,7 @@ _None._
 
 ### New Features
 
-_None._
+- Support updating media metadata via XMLRPC API [#809]
 
 ### Bug Fixes
 
diff --git a/Sources/WordPressKit/Services/MediaServiceRemoteXMLRPC.m b/Sources/WordPressKit/Services/MediaServiceRemoteXMLRPC.m
index 0d0059ea..bcdc105e 100644
--- a/Sources/WordPressKit/Services/MediaServiceRemoteXMLRPC.m
+++ b/Sources/WordPressKit/Services/MediaServiceRemoteXMLRPC.m
@@ -199,10 +199,44 @@ - (void)updateMedia:(RemoteMedia *)media
             success:(void (^)(RemoteMedia *remoteMedia))success
             failure:(void (^)(NSError *error))failure
 {
-    //HACK: Sergio Estevao: 2016-04-06 this option doens't exist on XML-RPC so we will always say that all was good
-    if (success) {
-        success(media);
+    NSParameterAssert([media.mediaID longLongValue] > 0);
+
+    NSMutableDictionary *content = [NSMutableDictionary dictionary];
+
+    if (media.title != nil) {
+        content[@"post_title"] = media.title;
+    }
+
+    if (media.caption != nil) {
+        content[@"post_excerpt"] = media.caption;
     }
+
+    if (media.descriptionText != nil) {
+        content[@"post_content"] = media.descriptionText;
+    }
+
+    NSArray *extraDefaults = @[media.mediaID];
+    NSArray *parameters = [self XMLRPCArgumentsWithExtraDefaults:extraDefaults andExtra:content];
+
+    [self.api callMethod:@"wp.editPost"
+              parameters:parameters
+                 success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+        BOOL updated = [responseObject boolValue];
+        if (updated) {
+            if (success) {
+                success(media);
+            }
+        } else {
+            if (failure) {
+                NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorUnknown userInfo:nil];
+                failure(error);
+            }
+        }
+    } failure:^(NSError *error, NSHTTPURLResponse *httpResponse) {
+        if (failure) {
+            failure(error);
+        }
+    }];
 }
 
 - (void)deleteMedia:(RemoteMedia *)media