diff --git a/jslib b/jslib
index 4004449aa8..678b191a32 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 4004449aa833a2a445fcdb2a9c80f4a014de0b89
+Subproject commit 678b191a32b053e38cc46e7c1b10aaa171d13201
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index f5d20e2cc4..a0f9d53647 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -42,6 +42,9 @@
             Using the Padlock desktop application, click the hamburger icon in the top left corner and navigate to "Settings" →
             "Export" button and save the file "As CSV".
         </ng-container>
+        <ng-container *ngIf="format === 'keepass2xml'">
+            Using the KeePass 2 desktop application, navigate to "File" &rarr; "Export" and select the "KeePass XML (2.x)" option.
+        </ng-container>
     </app-callout>
     <div class="row">
         <div class="col-6">
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts
index 5ae65a84c8..e387a12de4 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -25,6 +25,7 @@ import { AviraCsvImporter } from 'jslib/importers/aviraCsvImporter';
 import { BitwardenCsvImporter } from 'jslib/importers/bitwardenCsvImporter';
 import { BlurCsvImporter } from 'jslib/importers/blurCsvImporter';
 import { Importer } from 'jslib/importers/importer';
+import { KeePass2XmlImporter } from 'jslib/importers/keepass2XmlImporter';
 import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter';
 import { LastPassCsvImporter } from 'jslib/importers/lastpassCsvImporter';
 import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
@@ -222,6 +223,8 @@ export class ImportComponent implements OnInit {
                 return new SafeInCloudXmlImporter();
             case 'padlockcsv':
                 return new PadlockCsvImporter();
+            case 'keepass2xml':
+                return new KeePass2XmlImporter();
             default:
                 return null;
         }