diff --git a/jslib b/jslib
index abb54f0073..dcbd09e736 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit abb54f007305eabd77996623dd20cbe45345e82a
+Subproject commit dcbd09e736b516b359369f9d9fe5b0f5a6c2a928
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 65c3ed7464..bd3b9730f2 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -609,6 +609,9 @@
   "exportWarningDesc": {
     "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
   },
+  "encExportWarningDesc": {
+    "message": "This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file."
+  },
   "exportMasterPassword": {
     "message": "Enter your master password to export your vault data."
   },
diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html
index c04ff10cad..f4a90062c9 100644
--- a/src/popup/settings/export.component.html
+++ b/src/popup/settings/export.component.html
@@ -21,6 +21,7 @@
                     <select id="format" name="Format" [(ngModel)]="format">
                         <option value="json">.json</option>
                         <option value="csv">.csv</option>
+                        <option value="encrypted_json">.json (Encrypted)</option>
                     </select>
                 </div>
                 <div class="box-content-row box-content-row-flex" appBoxRow>
@@ -40,7 +41,13 @@
             </div>
             <div class="box-footer">
                 <p>{{'exportMasterPassword' | i18n}}</p>
-                <strong>{{'warning' | i18n}}</strong>: {{'exportWarningDesc' | i18n}}
+                <strong>{{'warning' | i18n}}</strong>:
+                <span *ngIf="!encryptedFormat">
+                    {{'exportWarningDesc' | i18n}}
+                </span>
+                <span *ngIf="encryptedFormat">
+                    {{'encExportWarningDesc' | i18n}}
+                </span>
             </div>
         </div>
     </content>