diff --git a/jslib b/jslib
index 4ba55c8c8b..06e412a095 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 4ba55c8c8bf12385502c1db4c9ba28c33792e433
+Subproject commit 06e412a095cb4eab41652a4f70ed2788ccec3f2b
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 532b4a7613..d04d83f500 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -67,6 +67,10 @@
             Use the
             <a target="_blank" href="https://github.com/kspearrin/ff-password-exporter/blob/master/README.md#ff-password-exporter">FF Password Exporter</a> application to export your passwords to a CSV file.
         </ng-container>
+        <ng-container *ngIf="format === '1password1pif' || format === '1passwordwincsv'">
+            See detailed instructions on our help site at
+            <a target="_blank" href="https://help.bitwarden.com/article/import-from-1password/">https://help.bitwarden.com/article/import-from-1password/</a>.
+        </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 62dbf41bb5..5b93be2841 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -31,6 +31,8 @@ import { KeePass2XmlImporter } from 'jslib/importers/keepass2XmlImporter';
 import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter';
 import { LastPassCsvImporter } from 'jslib/importers/lastpassCsvImporter';
 import { MeldiumCsvImporter } from 'jslib/importers/meldiumCsvImporter';
+import { OnePassword1PifImporter } from 'jslib/importers/onepassword1PifImporter';
+import { OnePasswordWinCsvImporter } from 'jslib/importers/onepasswordWinCsvImporter';
 import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
 import { SafeInCloudXmlImporter } from 'jslib/importers/safeInCloudXmlImporter';
 import { SaferPassCsvImporter } from 'jslib/importers/saferpassCsvImport';
@@ -180,7 +182,7 @@ export class ImportComponent implements OnInit {
 
         this.importOptions = [
             { id: 'keepassxcsv', name: 'KeePassX (csv)' },
-            { id: '1password6wincsv', name: '1Password 6 Windows (csv)' },
+            { id: '1passwordwincsv', name: '1Password 6 and 7 Windows (csv)' },
             { id: 'roboformcsv', name: 'RoboForm (csv)' },
             { id: 'keepercsv', name: 'Keeper (csv)' },
             { id: 'enpasscsv', name: 'Enpass (csv)' },
@@ -242,6 +244,10 @@ export class ImportComponent implements OnInit {
                 return new SaferPassCsvImporter();
             case 'meldiumcsv':
                 return new MeldiumCsvImporter();
+            case '1password1pif':
+                return new OnePassword1PifImporter();
+            case '1passwordwincsv':
+                return new OnePasswordWinCsvImporter();
             default:
                 return null;
         }