diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 0a905dc6..23a1f902 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -29,8 +29,8 @@ execute "add-android-sdk-path" do
   not_if "grep #{sdk_loc} /home/#{user}/.bashrc"
 end
 
-%w{android-3 android-4 android-7 android-8 android-10
-   android-11 android-13 android-14 android-15 android-16}.each do |sdk|
+%w{android-3 android-4 android-7 android-8 android-10 android-11
+   android-12 android-13 android-14 android-15 android-16}.each do |sdk|
 
   script "add_sdk_#{sdk}" do
     interpreter "bash"
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index c6bc53f3..0dd2942b 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -704,13 +704,13 @@ class DescriptionFormatter:
                 index = txt.find("]")
                 if index == -1:
                     raise MetaDataException("Unterminated ]")
-                url = txt[2:index]
+                url = txt[1:index]
                 index2 = url.find(' ')
                 if index2 == -1:
                     urltxt = url
                 else:
                     urltxt = url[index2 + 1:]
-                    url = url[:index]
+                    url = url[:index2]
                 linkified_html += '<a href="' + url + '">' + cgi.escape(urltxt) + '</a>'
                 linkified_plain += urltxt
                 if urltxt != url: