diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index ddd4d0c53ff1..03905cbdfaf0 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -153,7 +153,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h", sourceFolder, "JSONValueTransformer+ISO8601.h"));
         supportingFiles.add(new SupportingFile("SWGConfiguration-body.mustache", sourceFolder, "SWGConfiguration.m"));
         supportingFiles.add(new SupportingFile("SWGConfiguration-header.mustache", sourceFolder, "SWGConfiguration.h"));
-        // supportingFiles.add(new SupportingFile("Podfile.mustache", "", "Podfile"));
+        supportingFiles.add(new SupportingFile("Podfile.mustache", "", "Podfile"));
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient-body.mustache b/modules/swagger-codegen/src/main/resources/objc/SWGApiClient-body.mustache
index 39ad87c76bb1..1b479d039e6f 100644
--- a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/SWGApiClient-body.mustache
@@ -500,7 +500,7 @@ static bool loggingEnabled = true;
 
     // setting response serializer
     if ([responseContentType isEqualToString:@"application/json"]) {
-        self.responseSerializer = [AFJSONResponseSerializer serializer];
+        self.responseSerializer = [SWGJSONResponseSerializer serializer];
     }
     else {
         self.responseSerializer = [AFHTTPResponseSerializer serializer];
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient-header.mustache b/modules/swagger-codegen/src/main/resources/objc/SWGApiClient-header.mustache
index 09cb6fe57bd7..691c92cc6256 100644
--- a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/SWGApiClient-header.mustache
@@ -1,6 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <ISO8601/ISO8601.h>
 #import "AFHTTPRequestOperationManager.h"
+#import "SWGJSONResponseSerializer.h"  
 
 {{#models}}{{#model}}#import "{{classname}}.h"  
 {{/model}}{{/models}}
diff --git a/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcshareddata/SwaggerClient.xccheckout b/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcshareddata/SwaggerClient.xccheckout
new file mode 100644
index 000000000000..325cb92c1b82
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcshareddata/SwaggerClient.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>15AAFA18-9D61-437F-988D-A691BA4C08B1</string>
+	<key>IDESourceControlProjectName</key>
+	<string>SwaggerClient</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>E5BBF0AA85077C865C95437976D06D819733A208</key>
+		<string>https://github.com/geekerzp/swagger-codegen.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>samples/client/petstore/objc/SwaggerClient.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>E5BBF0AA85077C865C95437976D06D819733A208</key>
+		<string>../../../../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/geekerzp/swagger-codegen.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>E5BBF0AA85077C865C95437976D06D819733A208</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>E5BBF0AA85077C865C95437976D06D819733A208</string>
+			<key>IDESourceControlWCCName</key>
+			<string>swagger-codegen</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate b/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate
index 79012184db63..d8a48b72bc2e 100644
Binary files a/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate and b/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 000000000000..e2573a5943cb
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "0"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>
diff --git a/samples/client/petstore/objc/SwaggerClient/SwaggerClient/ViewController.m b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/ViewController.m
index 5ba0fe183826..388cacbb157d 100644
--- a/samples/client/petstore/objc/SwaggerClient/SwaggerClient/ViewController.m
+++ b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/ViewController.m
@@ -56,11 +56,14 @@
 //                     }
      ];
     */
-    SWGUserApi *api = [[SWGUserApi alloc] init];
-    [api loginUserWithCompletionBlock:@"username" password:@"password" completionHandler:^(NSString *output, NSError *error) {
-        NSLog(@"output => %@", output);
-        NSLog(@"error => %@", error);
-    }];
+    SWGPetApi *api = [[SWGPetApi alloc] init];
+    [api deletePetWithCompletionBlock:@"hello"
+                                petId:@1434529787992
+                    completionHandler:^(NSError *error) {
+                        if (error) {
+                            NSLog(@"%@", error);
+                        }
+                    }];
 }
 
 - (void)didReceiveMemoryWarning
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/StoreApiTest.m b/samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/StoreApiTest.m
similarity index 100%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/StoreApiTest.m
rename to samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/StoreApiTest.m
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/UserApiTest.m b/samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/UserApiTest.m
similarity index 100%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/UserApiTest.m
rename to samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/UserApiTest.m
diff --git a/samples/client/petstore/objc/client/SWGApiClient.h b/samples/client/petstore/objc/client/SWGApiClient.h
index 829aec58b968..6ede775cb02c 100644
--- a/samples/client/petstore/objc/client/SWGApiClient.h
+++ b/samples/client/petstore/objc/client/SWGApiClient.h
@@ -1,6 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <ISO8601/ISO8601.h>
 #import "AFHTTPRequestOperationManager.h"
+#import "SWGJSONResponseSerializer.h"  
 
 #import "SWGUser.h"  
 #import "SWGCategory.h"  
diff --git a/samples/client/petstore/objc/client/SWGApiClient.m b/samples/client/petstore/objc/client/SWGApiClient.m
index 39ad87c76bb1..1b479d039e6f 100644
--- a/samples/client/petstore/objc/client/SWGApiClient.m
+++ b/samples/client/petstore/objc/client/SWGApiClient.m
@@ -500,7 +500,7 @@ static bool loggingEnabled = true;
 
     // setting response serializer
     if ([responseContentType isEqualToString:@"application/json"]) {
-        self.responseSerializer = [AFJSONResponseSerializer serializer];
+        self.responseSerializer = [SWGJSONResponseSerializer serializer];
     }
     else {
         self.responseSerializer = [AFHTTPResponseSerializer serializer];