diff --git a/lib/fog/aws/parsers/iam/upload_server_certificate.rb b/lib/fog/aws/parsers/iam/upload_server_certificate.rb
new file mode 100644
index 000000000..964b01e7a
--- /dev/null
+++ b/lib/fog/aws/parsers/iam/upload_server_certificate.rb
@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module IAM
+
+        class UploadServerCertificate < Fog::Parsers::Base
+
+          def reset
+            @response = { 'Certificate' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'Arn', 'Path', 'ServerCertificateId', 'ServerCertificateName', 'UploadDate'
+              @response['Certificate'][name] = @value
+            when 'RequestId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end
diff --git a/lib/fog/aws/requests/iam/upload_server_certificate.rb b/lib/fog/aws/requests/iam/upload_server_certificate.rb
index f6b845096..7d4db71e2 100644
--- a/lib/fog/aws/requests/iam/upload_server_certificate.rb
+++ b/lib/fog/aws/requests/iam/upload_server_certificate.rb
@@ -3,7 +3,7 @@ module Fog
     class IAM
       class Real
 
-        require 'fog/aws/parsers/iam/basic'
+        require 'fog/aws/parsers/iam/upload_server_certificate'
 
         # Uploads a server certificate entity for the AWS Account.
         # Includes a public key certificate, a private key, and an optional certificate chain, which should all be PEM-encoded.
@@ -35,7 +35,7 @@ module Fog
             'CertificateBody'       => certificate,
             'PrivateKey'            => private_key,
             'ServerCertificateName' => name,
-            :parser                 => Fog::Parsers::AWS::IAM::Basic.new
+            :parser                 => Fog::Parsers::AWS::IAM::UploadServerCertificate.new
           }.merge!(options))
         end