diff --git a/src/app/services/importService.js b/src/app/services/importService.js
index fa1b64ae62c..aac63ed60be 100644
--- a/src/app/services/importService.js
+++ b/src/app/services/importService.js
@@ -68,6 +68,9 @@
                 case 'clipperzhtml':
                     importClipperzHtml(file, success, error);
                     break;
+                case 'avirajson':
+                    importAviraJson(file, success, error);
+                    break;
                 default:
                     error();
                     break;
@@ -1645,5 +1648,59 @@
             };
         }
 
+        function importAviraJson(file, success, error) {
+            var folders = [],
+                sites = [],
+                siteRelationships = [],
+                i = 0;
+
+            var reader = new FileReader();
+            reader.readAsText(file, 'utf-8');
+            reader.onload = function (evt) {
+                var fileContent = evt.target.result;
+                var fileJson = JSON.parse(fileContent);
+                if (fileJson) {
+                    if (fileJson.accounts) {
+                        for (i = 0; i < fileJson.accounts.length; i++) {
+                            var account = fileJson.accounts[i];
+                            var site = {
+                                favorite: account.is_favorite && account.is_favorite === true,
+                                uri: account.domain && account.domain !== '' ? trimUri(account.domain) : null,
+                                username: account.username && account.username !== '' ? account.username : null,
+                                password: account.password && account.password !== '' ? account.password : null,
+                                notes: null,
+                                name: account.label && account.label !== '' ? account.label : account.domain,
+                            };
+
+                            if (account.email && account.email !== '') {
+                                if (!site.username || site.username === '') {
+                                    site.username = account.email;
+                                }
+                                else {
+                                    site.notes = account.email;
+                                }
+                            }
+
+                            if (!site.name || site.name === '') {
+                                site.name = '--';
+                            }
+
+                            if (site.uri && !site.uri.startsWith('http')) {
+                                site.uri = 'http://' + site.uri;
+                            }
+
+                            sites.push(site);
+                        }
+                    }
+                }
+
+                success(folders, sites, siteRelationships);
+            };
+
+            reader.onerror = function (evt) {
+                error();
+            };
+        }
+
         return _service;
     });
diff --git a/src/app/tools/views/toolsImport.html b/src/app/tools/views/toolsImport.html
index 156a4978a92..dc2e5dcf3c5 100644
--- a/src/app/tools/views/toolsImport.html
+++ b/src/app/tools/views/toolsImport.html
@@ -26,6 +26,7 @@
                 <option value="msecurecsv">mSecure (csv)</option>
                 <option value="truekeyjson">True Key (json)</option>
                 <option value="clipperzhtml">Clipperz (html)</option>
+                <option value="avirajson">Avira (json)</option>
             </select>
         </div>
         <div class="form-group">