diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
index 427d847663b..23b5fe2ea50 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
@@ -12,7 +12,7 @@ module {{package}} {
     */
 {{/description}}
     export class {{classname}} {
-        private basePath = '{{contextPath}}';
+        private basePath = '{{basePath}}';
 
         static $inject: string[] = ['$http'];
 
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
index f8d4577ee7a..5f6428ce7e2 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
@@ -95,7 +95,7 @@ class VoidAuth implements Authentication {
 */
 {{/description}}
 export class {{classname}} {
-    private basePath = '{{contextPath}}';
+    private basePath = '{{basePath}}';
     public authentications = {
         'default': <Authentication>new VoidAuth(),
 {{#authMethods}}
diff --git a/samples/client/petstore/swift/PetstoreClient.podspec b/samples/client/petstore/swift/PetstoreClient.podspec
new file mode 100644
index 00000000000..00c0ef33e12
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient.podspec
@@ -0,0 +1,11 @@
+Pod::Spec.new do |s|
+  s.name = 'PetstoreClient'
+  s.ios.deployment_target = '8.0'
+  s.osx.deployment_target = '10.9'
+  s.version = '0.0.1'
+  s.source = { :git => 'git@github.com:swagger-api/swagger-mustache.git', :tag => 'v1.0.0' }
+  s.license = 'Apache License, Version 2.0'
+  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.dependency 'PromiseKit', '~> 2.1'
+  s.dependency 'Alamofire', '~> 1.3'
+end
diff --git a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
index 6bb4e10d387..3189f6166e4 100644
--- a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
@@ -6,7 +6,7 @@ module API.Client {
     'use strict';
 
     export class PetApi {
-        private basePath = '/v2';
+        private basePath = 'http://petstore.swagger.io/v2';
 
         static $inject: string[] = ['$http'];
 
diff --git a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
index 948b6859381..443ea5d0c58 100644
--- a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
@@ -6,7 +6,7 @@ module API.Client {
     'use strict';
 
     export class StoreApi {
-        private basePath = '/v2';
+        private basePath = 'http://petstore.swagger.io/v2';
 
         static $inject: string[] = ['$http'];
 
diff --git a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
index eb04f4b31f0..aaf2ef81bb1 100644
--- a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
@@ -6,7 +6,7 @@ module API.Client {
     'use strict';
 
     export class UserApi {
-        private basePath = '/v2';
+        private basePath = 'http://petstore.swagger.io/v2';
 
         static $inject: string[] = ['$http'];
 
diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts
index 0b7089fdaae..52a3d7f9706 100644
--- a/samples/client/petstore/typescript-node/api.ts
+++ b/samples/client/petstore/typescript-node/api.ts
@@ -118,7 +118,7 @@ class VoidAuth implements Authentication {
 }
 
 export class UserApi {
-    private basePath = '/v2';
+    private basePath = 'http://petstore.swagger.io/v2';
     public authentications = {
         'default': <Authentication>new VoidAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
@@ -528,7 +528,7 @@ export class UserApi {
     }
 }
 export class PetApi {
-    private basePath = '/v2';
+    private basePath = 'http://petstore.swagger.io/v2';
     public authentications = {
         'default': <Authentication>new VoidAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
@@ -980,7 +980,7 @@ export class PetApi {
     }
 }
 export class StoreApi {
-    private basePath = '/v2';
+    private basePath = 'http://petstore.swagger.io/v2';
     public authentications = {
         'default': <Authentication>new VoidAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),