diff --git a/src/Web/wwwroot/app/services/importService.js b/src/Web/wwwroot/app/services/importService.js
index 657d3b8b17..6e43a7a20d 100644
--- a/src/Web/wwwroot/app/services/importService.js
+++ b/src/Web/wwwroot/app/services/importService.js
@@ -35,6 +35,9 @@
                 case 'chromecsv':
                     importChromeCsv(file, success, error);
                     break;
+                case 'firefoxpasswordexportercsvxml':
+                    importFirefoxPasswordExporterCsvXml(file, success, error);
+                    break;
                 default:
                     error();
                     break;
@@ -647,5 +650,94 @@
             });
         }
 
+        function importFirefoxPasswordExporterCsvXml(file, success, error) {
+            var folders = [],
+                sites = [],
+                siteRelationships = [];
+
+            function getNameFromHost(host) {
+                var name = '--';
+                try {
+                    if (host && host !== '') {
+                        var parser = document.createElement('a');
+                        parser.href = host;
+                        if (parser.hostname) {
+                            name = parser.hostname;
+                        }
+                    }
+                }
+                catch (e) {
+                    // do nothing
+                }
+
+                return name;
+            }
+
+            if (file.type === 'text/xml') {
+                var reader = new FileReader();
+                reader.readAsText(file, 'utf-8');
+                reader.onload = function (evt) {
+                    var xmlDoc = $.parseXML(evt.target.result),
+                        xml = $(xmlDoc);
+
+                    var entries = xml.find('entry');
+                    for (var i = 0; i < entries.length; i++) {
+                        var entry = $(entries[i]);
+                        if (!entry) {
+                            continue;
+                        }
+
+                        var host = entry.attr('host'),
+                            user = entry.attr('user'),
+                            password = entry.attr('password');
+
+                        sites.push({
+                            favorite: false,
+                            uri: host && host !== '' ? trimUri(host) : null,
+                            username: user && user !== '' ? user : null,
+                            password: password && password !== '' ? password : null,
+                            notes: null,
+                            name: getNameFromHost(host),
+                        });
+                    }
+
+                    success(folders, sites, siteRelationships);
+                };
+
+                reader.onerror = function (evt) {
+                    error();
+                };
+            }
+            else {
+                // currently bugged due to the comment
+                // ref: https://github.com/mholt/PapaParse/issues/351
+
+                error('Only .xml exports are supported.');
+                return;
+
+                //Papa.parse(file, {
+                //    comments: '#',
+                //    header: true,
+                //    encoding: 'UTF-8',
+                //    complete: function (results) {
+                //        parseCsvErrors(results);
+
+                //        angular.forEach(results.data, function (value, key) {
+                //            sites.push({
+                //                favorite: false,
+                //                uri: value.hostname && value.hostname !== '' ? trimUri(value.hostname) : null,
+                //                username: value.username && value.username !== '' ? value.username : null,
+                //                password: value.password && value.password !== '' ? value.password : null,
+                //                notes: null,
+                //                name: getNameFromHost(value.hostname),
+                //            });
+                //        });
+
+                //        success(folders, sites, siteRelationships);
+                //    }
+                //});
+            }
+        }
+
         return _service;
     });
diff --git a/src/Web/wwwroot/app/tools/views/toolsImport.html b/src/Web/wwwroot/app/tools/views/toolsImport.html
index 61661d1b00..2e54e54158 100644
--- a/src/Web/wwwroot/app/tools/views/toolsImport.html
+++ b/src/Web/wwwroot/app/tools/views/toolsImport.html
@@ -10,6 +10,7 @@
                 <option value="local">bitwarden (csv)</option>
                 <option value="lastpass">LastPass (csv)</option>
                 <option value="chromecsv">Chrome (csv)</option>
+                <option value="firefoxpasswordexportercsvxml">Firefox Password Exporter (xml)</option>
                 <option value="safeincloudxml">SafeInCloud (xml)</option>
                 <option value="safeincloudcsv">SafeInCloud (csv)</option>
                 <option value="keypassxml">KeyPass (xml)</option>