diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
index e6cc8fac49a..f90cc290105 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
@@ -290,7 +290,8 @@ module {{moduleName}}
 
     def build_request_body(header_params, form_params, body)
       # http form
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded'
+      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
+          header_params['Content-Type'] == 'multipart/form-data'
         data = form_params.dup
         data.each do |key, value|
           data[key] = value.to_s if value && !value.is_a?(File)
diff --git a/samples/client/petstore/ruby/hello.txt b/samples/client/petstore/ruby/hello.txt
new file mode 100644
index 00000000000..6769dd60bdf
--- /dev/null
+++ b/samples/client/petstore/ruby/hello.txt
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index 9fa3a39f5f7..4e4d88f9476 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -13,8 +13,8 @@ require 'petstore/models/order'
 
 # APIs
 require 'petstore/api/user_api'
-require 'petstore/api/pet_api'
 require 'petstore/api/store_api'
+require 'petstore/api/pet_api'
 
 module Petstore
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
index 5f21e703fb6..b148a2f259c 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -238,7 +238,7 @@ module Petstore
       post_body = nil
       
 
-      auth_names = ['api_key', 'petstore_auth']
+      auth_names = ['petstore_auth', 'api_key']
       result = @api_client.call_api(:GET, path,
         :header_params => header_params,
         :query_params => query_params,
diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb
index 6d4dda8f939..9545aba75a3 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb
@@ -290,7 +290,8 @@ module Petstore
 
     def build_request_body(header_params, form_params, body)
       # http form
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded'
+      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
+          header_params['Content-Type'] == 'multipart/form-data'
         data = form_params.dup
         data.each do |key, value|
           data[key] = value.to_s if value && !value.is_a?(File)
diff --git a/samples/client/petstore/ruby/spec/pet_spec.rb b/samples/client/petstore/ruby/spec/pet_spec.rb
index c288ec2192e..5d379bf4921 100644
--- a/samples/client/petstore/ruby/spec/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/pet_spec.rb
@@ -105,5 +105,16 @@ describe "Pet" do
       pet.id.should == 10002
       pet.name.should == "RUBY UNIT TESTING"
     end
+
+    it "should upload a file to a pet" do
+      pet = Petstore::Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING")
+      result = @pet_api.add_pet(:body => pet)
+      # nothing is returned
+      result.should be_nil
+
+      result = @pet_api.upload_file(10002, file: File.new('hello.txt'))
+      # nothing is returned
+      result.should be_nil
+    end
   end
 end