diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index beaf097a..18bd3d47 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -42,7 +42,15 @@ https_enforcings = [
     enforce_https('bitbucket.org'),
     enforce_https('apache.org'),
     enforce_https('google.com'),
+    enforce_https('git.code.sf.net'),
     enforce_https('svn.code.sf.net'),
+    enforce_https('anongit.kde.org'),
+    enforce_https('savannah.nongnu.org'),
+    enforce_https('git.savannah.nongnu.org'),
+    enforce_https('download.savannah.nongnu.org'),
+    enforce_https('savannah.gnu.org'),
+    enforce_https('git.savannah.gnu.org'),
+    enforce_https('download.savannah.gnu.org'),
 ]
 
 
@@ -52,13 +60,59 @@ def forbid_shortener(domain):
 
 
 http_url_shorteners = [
-    forbid_shortener('goo.gl'),
-    forbid_shortener('t.co'),
-    forbid_shortener('ur1.ca'),
-    forbid_shortener('is.gd'),
+    forbid_shortener('1url.com'),
+    forbid_shortener('adf.ly'),
+    forbid_shortener('bc.vc'),
+    forbid_shortener('bit.do'),
     forbid_shortener('bit.ly'),
+    forbid_shortener('bitly.com'),
+    forbid_shortener('budurl.com'),
+    forbid_shortener('buzurl.com'),
+    forbid_shortener('cli.gs'),
+    forbid_shortener('cur.lv'),
+    forbid_shortener('cutt.us'),
+    forbid_shortener('db.tt'),
+    forbid_shortener('filoops.info'),
+    forbid_shortener('goo.gl'),
+    forbid_shortener('is.gd'),
+    forbid_shortener('ity.im'),
+    forbid_shortener('j.mp'),
+    forbid_shortener('l.gg'),
+    forbid_shortener('lnkd.in'),
+    forbid_shortener('moourl.com'),
+    forbid_shortener('ow.ly'),
+    forbid_shortener('para.pt'),
+    forbid_shortener('po.st'),
+    forbid_shortener('q.gs'),
+    forbid_shortener('qr.ae'),
+    forbid_shortener('qr.net'),
+    forbid_shortener('rdlnk.com'),
+    forbid_shortener('scrnch.me'),
+    forbid_shortener('short.nr'),
+    forbid_shortener('sn.im'),
+    forbid_shortener('snipurl.com'),
+    forbid_shortener('su.pr'),
+    forbid_shortener('t.co'),
     forbid_shortener('tiny.cc'),
+    forbid_shortener('tinyarrows.com'),
     forbid_shortener('tinyurl.com'),
+    forbid_shortener('tr.im'),
+    forbid_shortener('tweez.me'),
+    forbid_shortener('twitthis.com'),
+    forbid_shortener('twurl.nl'),
+    forbid_shortener('tyn.ee'),
+    forbid_shortener('u.bb'),
+    forbid_shortener('u.to'),
+    forbid_shortener('ur1.ca'),
+    forbid_shortener('urlof.site'),
+    forbid_shortener('v.gd'),
+    forbid_shortener('vzturl.com'),
+    forbid_shortener('x.co'),
+    forbid_shortener('xrl.us'),
+    forbid_shortener('yourls.org'),
+    forbid_shortener('zip.net'),
+    forbid_shortener('✩.ws'),
+    forbid_shortener('➡.ws'),
 ]
 
 http_checks = https_enforcings + http_url_shorteners + [
@@ -101,17 +155,13 @@ regex_checks = {
         (re.compile(r'.*\s$'),
          _("Unnecessary trailing space")),
     ],
-    'Description': [
+    'Description': https_enforcings + http_url_shorteners + [
         (re.compile(r'\s*[*#][^ .]'),
          _("Invalid bulleted list")),
         (re.compile(r'^\s'),
          _("Unnecessary leading space")),
         (re.compile(r'.*\s$'),
          _("Unnecessary trailing space")),
-        (re.compile(r'.*([^[]|^)\[[^:[\]]+( |\]|$)'),
-         _("Invalid link - use [http://foo.bar Link title] or [http://foo.bar]")),
-        (re.compile(r'(^|.* )https?://[^ ]+'),
-         _("Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]")),
     ],
 }