diff --git a/jslib b/jslib
index 1660d7570b..4d702f4de3 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 1660d7570b41ddc433ff7b2ac4d6d6798ac4fc94
+Subproject commit 4d702f4de3dc299ac7c3295b61ff1d21cce17592
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index b231d8492c..22dd72f631 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -107,6 +107,12 @@
             Log into the Clipperz web application (clipperz.is/app). Click the hamburger menu icon in the top right to expand the navigation
             bar. Navigate to "Data" → "Export". Click the "download HTML+JSON" button to save the HTML file.
         </ng-container>
+        <ng-container *ngIf="format === 'roboformcsv'">
+            Using the RoboForm Editor desktop application, navigate to "RoboForm" (top left) &rarr; "Options" &rarr; "Account &amp; Data"
+            and click the "Export" button. Select all of your data, change the "Format" to "CSV file" and then click the
+            "Export" button to save the CSV file. Note: RoboForm only allows you to export Logins. Other items will not be
+            exported.
+        </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 3c2510b43c..82f2de3ed4 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -41,6 +41,7 @@ import { OnePasswordWinCsvImporter } from 'jslib/importers/onepasswordWinCsvImpo
 import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
 import { PasswordDragonXmlImporter } from 'jslib/importers/passwordDragonXmlImporter';
 import { PasswordSafeXmlImporter } from 'jslib/importers/passwordSafeXmlImporter';
+import { RoboFormCsvImporter } from 'jslib/importers/roboformCsvImporter';
 import { SafeInCloudXmlImporter } from 'jslib/importers/safeInCloudXmlImporter';
 import { SaferPassCsvImporter } from 'jslib/importers/saferpassCsvImport';
 import { StickyPasswordXmlImporter } from 'jslib/importers/stickyPasswordXmlImporter';
@@ -275,6 +276,8 @@ export class ImportComponent implements OnInit {
                 return new TrueKeyCsvImporter();
             case 'clipperzhtml':
                 return new ClipperzHtmlImporter();
+            case 'roboformcsv':
+                return new RoboFormCsvImporter();
             default:
                 return null;
         }