diff --git a/badge.js b/badge.js
index 1908fa4eae..a2c435f64a 100644
--- a/badge.js
+++ b/badge.js
@@ -35,8 +35,12 @@ function escapeXml(s) {
           .replace(/"/g, '"')
           .replace(/'/g, ''');
 }
+function capitalize(s) {
+  return s[0].toUpperCase() + s.slice(1);
+}
 function addEscapers(data) {
   data.escapeXml = escapeXml;
+  data.capitalize = capitalize;
 }
 
 var colorscheme = require(path.join(__dirname, 'colorscheme.json'));
@@ -77,6 +81,10 @@ function makeImage(data, cb) {
   ];
   if (data.links === undefined) {
     data.links = ['', ''];
+  } else {
+    for (var i = 0; i < data.links.length; i++) {
+      data.links[i] = escapeXml(data.links[i]);
+    }
   }
 
   var template = templates[data.template + '-' + data.format];
diff --git a/templates/social-template.svg b/templates/social-template.svg
index 17f76d95a7..fbafc90b49 100644
--- a/templates/social-template.svg
+++ b/templates/social-template.svg
@@ -22,14 +22,14 @@
   {{?}}
   <rect x="{{=it.widths[0]+6}}" y="7.5" width="0.5" height="5" stroke="#fafafa"/>
   <g fill="#333" text-anchor="middle" font-family="Helvetica Neue,Helvetica,Arial,sans-serif" font-weight="700" font-size="11px" line-height="14px">
-    <text x="{{=(it.widths[0]+it.logoWidth+it.logoPadding)/2}}" y="15" fill="#fff">{{=it.escapeXml(it.text[0])}}</text>
-    <text x="{{=(it.widths[0]+it.logoWidth+it.logoPadding)/2}}" y="14">{{=it.escapeXml(it.text[0])}}</text>
-    <text x="{{=it.widths[0]+it.widths[1]/2+6}}" y="15" fill="#fff">{{=it.escapeXml(it.text[1])}}</text>
-    <a xlink:href="{{=it.links[0]}}">
-      <text id="rlink" x="{{=it.widths[0]+it.widths[1]/2+6}}" y="14">{{=it.escapeXml(it.text[1])}}</text>
+    <text x="{{=(it.widths[0]+it.logoWidth+it.logoPadding)/2}}" y="15" fill="#fff">{{=it.escapeXml(it.capitalize(it.text[0]))}}</text>
+    <text x="{{=(it.widths[0]+it.logoWidth+it.logoPadding)/2}}" y="14">{{=it.escapeXml(it.capitalize(it.text[0]))}}</text>
+    <text x="{{=it.widths[0]+it.widths[1]/2+6}}" y="15" fill="#fff">{{=it.escapeXml(it.capitalize(it.text[1]))}}</text>
+    <a xlink:href="{{=it.links[1]}}">
+      <text id="rlink" x="{{=it.widths[0]+it.widths[1]/2+6}}" y="14">{{=it.escapeXml(it.capitalize(it.text[1]))}}</text>
     </a>
   </g>
-  <a xlink:href="{{=it.links[1]}}">
+  <a xlink:href="{{=it.links[0]}}">
     <rect id="llink" stroke="#d5d5d5" fill="url(#a)" x="0.5" y="0.5" width="{{=it.widths[0]}}" height="19" rx="2"/>
   </a>
 </svg>