diff --git a/VERSION.txt b/VERSION.txt
index a3e01032832..e49b9f514dd 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,6 +1,7 @@
 jetty-7.1.1-SNAPSHOT
  + 302344 Make the list of available contexts if root context is not configured optional
  + 304803 Remove TypeUtil Integer and Long caches
+ + 306226 HttpClient should allow changing the keystore and truststore type
  + 308857 Update test suite to JUnit4 - Module jetty-jndi
  + 308856 Update test suite to JUnit4 - Module jetty-jmx
  + 308860 Update test suite to JUnit4 - Module jetty-rewrite
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
index a6b3c4ba546..5c81aa2a0e4 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
@@ -800,12 +800,36 @@ public class HttpClient extends HttpBuffers implements Attributes
     /* ------------------------------------------------------------ */
     public void setKeyManagerPassword(String keyManagerPassword)
     {
-        this._keyManagerPassword = new Password(keyManagerPassword).toString();;
+        this._keyManagerPassword = new Password(keyManagerPassword).toString();
     }
 
     /* ------------------------------------------------------------ */
     public void setTrustStorePassword(String trustStorePassword)
     {
-        this._trustStorePassword = new Password(trustStorePassword).toString();;
+        this._trustStorePassword = new Password(trustStorePassword).toString();
+    }
+    
+    /* ------------------------------------------------------------ */
+    public String getKeyStoreType()
+    {
+        return this._keyStoreType;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public void setKeyStoreType(String keyStoreType)
+    {
+        this._keyStoreType = keyStoreType;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public String getTrustStoreType()
+    {
+        return this._trustStoreType;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public void setTrustStoreType(String trustStoreType)
+    {
+        this._trustStoreType = trustStoreType;
     }
 }