diff --git a/browser/components/preferences/security.js b/browser/components/preferences/security.js
index ae2900361c..35caaceab1 100644
--- a/browser/components/preferences/security.js
+++ b/browser/components/preferences/security.js
@@ -15,6 +15,7 @@ var gSecurityPane = {
   {
     this._pane = document.getElementById("paneSecurity");
     this._initMasterPasswordUI();
+    this._initHPKPUI();
   },
 
   // ADD-ONS
@@ -219,6 +220,31 @@ var gSecurityPane = {
     document.documentElement.openWindow("Toolkit:PasswordManager",
                                         "chrome://passwordmgr/content/passwordManager.xul",
                                         "", null);
-  }
+  },
+  
+  _initHPKPUI: function() {
+    let checkbox = document.getElementById("enableHPKP");
+    let HPKPpref = document.getElementById("security.cert_pinning.enforcement_level");
 
+    if (HPKPpref.value == 0) {
+      checkbox.checked = false;
+    } else {
+      checkbox.checked = true;
+    }
+  },
+      
+  /**
+   * Updates the HPKP enforcement level to the proper value depending on checkbox
+   * state.
+   */
+  updateHPKPPref: function() {
+    let checkbox = document.getElementById("enableHPKP");
+    let HPKPpref = document.getElementById("security.cert_pinning.enforcement_level");
+    
+    if (checkbox.checked) {
+      HPKPpref.value = 2;
+    } else {
+      HPKPpref.value = 0;
+    }
+  }
 };
diff --git a/browser/components/preferences/security.xul b/browser/components/preferences/security.xul
index 35a6e1b66e..9e5870b209 100644
--- a/browser/components/preferences/security.xul
+++ b/browser/components/preferences/security.xul
@@ -41,6 +41,15 @@
 
       <!-- Passwords -->
       <preference id="signon.rememberSignons" name="signon.rememberSignons" type="bool"/>
+
+      <!-- Security Protocols -->
+      
+      <preference id="network.stricttransportsecurity.enabled"
+                  name="network.stricttransportsecurity.enabled"
+                  type="bool"/>
+      <preference id="security.cert_pinning.enforcement_level"
+                  name="security.cert_pinning.enforcement_level"
+                  type="int"/>
       
       <!-- XSS Filter -->
       <!--
@@ -103,6 +112,22 @@
       </hbox>
     </groupbox>
 
+    <!-- Security protocols -->
+    <groupbox id="SecProtoGroup">
+      <caption label="&SecProto.label;"/>
+    
+      <vbox id="SecProtoBox" align="start" flex="1">
+        <checkbox id="enableHSTS"
+                  label="&enableHSTS.label;"
+                  accesskey="&enableHSTS.accesskey;"
+                  preference="network.stricttransportsecurity.enabled" />
+        <checkbox id="enableHPKP"
+                  label="&enableHPKP.label;"
+                  accesskey="&enableHPKP.accesskey;"
+                  oncommand="gSecurityPane.updateHPKPPref();"/>
+      </vbox>
+    </groupbox>
+
     <!-- XSS Filter -->
     <!--
     <groupbox id="XSSFiltGroup">
diff --git a/browser/locales/en-US/chrome/browser/preferences/security.dtd b/browser/locales/en-US/chrome/browser/preferences/security.dtd
index 7298705ba5..b9a77a6939 100644
--- a/browser/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/security.dtd
@@ -37,6 +37,12 @@
 <!ENTITY  savedPasswords.label            "Saved Passwords…">
 <!ENTITY  savedPasswords.accesskey        "P">
 
+<!ENTITY  SecProto.label             "Security Protocols">
+<!ENTITY  enableHSTS.label           "Enable Strict Transport Security (HSTS)">
+<!ENTITY  enableHSTS.accesskey       "S">
+<!ENTITY  enableHPKP.label           "Enable Certificate Key Pinning (HPKP)">
+<!ENTITY  enableHPKP.accesskey       "C">
+
 <!ENTITY  XSSFilt.label              "XSS Filter">
 <!ENTITY  enableXSSFilt.label        "Enable XSS filter">
 <!ENTITY  enableXSSFilt.accesskey    "f">