diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
index 48d4a86b09d..55d358154f8 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
@@ -84,6 +84,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     typeMapping.put("list", "array");
 
     supportingFiles.add(new SupportingFile("composer.mustache", packagePath, "composer.json"));
+    supportingFiles.add(new SupportingFile("configuration.mustache", packagePath + "/lib", "Configuration.php"));
     supportingFiles.add(new SupportingFile("APIClient.mustache", packagePath + "/lib", "APIClient.php"));
     supportingFiles.add(new SupportingFile("APIClientException.mustache", packagePath + "/lib", "APIClientException.php"));
     supportingFiles.add(new SupportingFile("require.mustache", packagePath, invokerPackage + ".php"));
diff --git a/modules/swagger-codegen/src/main/resources/php/APIClient.mustache b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
index bb43e7bdc4b..e1de6566b17 100644
--- a/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
@@ -68,6 +68,8 @@ class APIClient {
   }
 
   /**
+   * update hearder and query param based on authentication setting
+   * 
    * @param array $headerParams
    * @param array $queryParams
    * @param array $authSettings
@@ -83,7 +85,8 @@ class APIClient {
       switch($auth) {
         {{#authMethods}}
         case '{{name}}':
-           {{#isApiKey}}{{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = Configuration::$api_key;{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = Configuration::$api_key;{{/isKeyInQuery}}{{#isBasic}}$headerParams['Authorization'] = base64_encode(Configuraiton::$username.":"Configuration::$password){{/isBasic}}{{/isApiKey}}
+           {{#isApiKey}}{{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = Configuration::$apiKey['{{keyParamName}}'];{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = Configuration::$apiKey['{{keyParamName}}'];{{/isKeyInQuery}}{{#isBasic}}$headerParams['Authorization'] = base64_encode(Configuraiton::$username.":"Configuration::$password){{/isBasic}}{{/isApiKey}}
+           {{#isOAuth}}#TODO support oauth{{/isOAuth}}
            break;
         {{/authMethods}}
       }
diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
new file mode 100644
index 00000000000..9af553702ae
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -0,0 +1,36 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+namespace {{invokerPackage}};
+
+class Configuration {
+
+  public static $PATCH = "PATCH";
+  public static $POST = "POST";
+  public static $GET = "GET";
+  public static $PUT = "PUT";
+  public static $DELETE = "DELETE";
+
+  // authentication setting
+  public static $apiKey = array();
+  public static $apiKeyPrefix = array();
+  public static $username = '';
+  public static $password = '';
+
+
+}
+
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
index b4678fc3ab9..5bc9b83ca0c 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
@@ -429,6 +429,9 @@
         "security": [
           {
             "api_key": []
+          },
+          {
+            "api_secret": []
           }
         ]
       }
@@ -802,6 +805,11 @@
       "name": "api_key",
       "in": "header"
     },
+    "api_secret": {
+      "type": "apiKey",
+      "name": "api_secret",
+      "in": "query"
+    },
     "petstore_auth": {
       "type": "oauth2",
       "authorizationUrl": "http://petstore.swagger.io/api/oauth/dialog",
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php
index e608421a891..d6b74f610e2 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php
@@ -68,6 +68,8 @@ class APIClient {
   }
 
   /**
+   * update hearder and query param based on authentication setting
+   * 
    * @param array $headerParams
    * @param array $queryParams
    * @param array $authSettings
@@ -79,16 +81,22 @@ class APIClient {
 
     // one endpoint can have more than 1 auth settings
     foreach($authSettings as $auth) {
-      // determine which auth scheme  to use
+      // determine which one to use
       switch($auth) {
         
         case 'api_key':
-           $headerParams['api_key'] = Configuration::$api_key;
+           $headerParams['api_key'] = Configuration::$apiKey['api_key'];
+           
+           break;
+        
+        case 'api_secret':
+           $queryParams['api_secret'] = Configuration::$apiKey['api_secret'];
            
            break;
         
         case 'petstore_auth':
            
+           #TODO support oauth
            break;
         
       }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
new file mode 100644
index 00000000000..9426efa9170
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+namespace SwaggerClient;
+
+class Configuration {
+
+  public static $PATCH = "PATCH";
+  public static $POST = "POST";
+  public static $GET = "GET";
+  public static $PUT = "PUT";
+  public static $DELETE = "DELETE";
+
+  // authentication setting
+  public static $apiKey = array();
+  public static $apiKeyPrefix = array();
+  public static $username = '';
+  public static $password = '';
+
+
+}
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
index 4012a88fc54..2b719114ff6 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
@@ -69,7 +69,7 @@ class StoreApi {
       }
 
       // authentication setting, if any
-      $authSettings = array('api_key');
+      $authSettings = array('api_key', 'api_secret');
 
       // make the API Call
       $response = $this->apiClient->callAPI($resourcePath, $method,