diff --git a/app/scripts/auto-type/auto-type-filter.js b/app/scripts/auto-type/auto-type-filter.js
index 0459e27c..cb1c8d33 100644
--- a/app/scripts/auto-type/auto-type-filter.js
+++ b/app/scripts/auto-type/auto-type-filter.js
@@ -46,8 +46,12 @@ AutoTypeFilter.prototype.getEntryRank = function(entry) {
         if (entryUrlParts) {
             const [, scheme, domain, path] = entryUrlParts;
             const [, thisScheme, thisDomain, thisPath] = this.urlParts;
-            if (domain === thisDomain) {
-                rank += 10;
+            if (domain === thisDomain || thisDomain.indexOf('.' + domain) > 0) {
+                if (domain === thisDomain) {
+                    rank += 20;
+                } else {
+                    rank += 10;
+                }
                 if (path === thisPath) {
                     rank += 10;
                 } else if (path && thisPath) {
diff --git a/release-notes.md b/release-notes.md
index fe5e6993..58666ff5 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -12,6 +12,7 @@ Release notes
 `*` password can be hidden as other fields  
 `*` clear clipboard on exit  
 `*` don't remove spaces in custom fields  
+`*` auto-type on subdomains  
 
 ##### v1.5.6 (2017-08-31)
 `-` fix #722: hang on start in desktop