diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 7a042a70..951c74fd 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -139,9 +139,11 @@ http_checks = (
         ),
         (
             re.compile(
-                r'^https://[^/]*(github|gitlab|bitbucket|rawgit|githubusercontent)\.[a-zA-Z]+/([^/]+/){2,3}master/'
+                r'^https://[^/]*(github|gitlab|bitbucket|rawgit|githubusercontent)\.[a-zA-Z]+/([^/]+/){2,3}(master|main)/'
+            ),
+            _(
+                "Use /HEAD instead of /master or /main to point at a file in the default branch"
             ),
-            _("Use /HEAD instead of /master to point at a file in the default branch"),
         ),
     ]
 )
@@ -464,7 +466,7 @@ def check_builds(app):
                     "Build generated by `fdroid import` - remove disable line once ready"
                 )
             continue
-        for s in ['master', 'origin', 'HEAD', 'default', 'trunk']:
+        for s in ['master', 'main', 'origin', 'HEAD', 'default', 'trunk']:
             if build.commit and build.commit.startswith(s):
                 yield _(
                     "Branch '{branch}' used as commit in build '{versionName}'"