diff --git a/tos/index.html b/tos/index.html
index 57eafd5..edde7aa 100644
--- a/tos/index.html
+++ b/tos/index.html
@@ -29,9 +29,10 @@
       <p>Please read this Agreement carefully before accessing or using the Website. If you do not agree to all the terms the Agreement, you may not access the Website or use any
       of its services. If these terms are considered an offer by Gitorious, acceptance is expressly limited to these terms. The Website is available only to individuals who are at
       least 13 years old.</p>
-
-      <h1>Change log</h1> 
-      <p><strong>Jan 31. 2011</strong>:This document was changed to reflect that gitorious.org is now operated by Shortcut AS subsidiary Gitorious AS. No changes apart from the company name and address.</p>.
+      
+      <h1>Change log</h1>
+      <p><strong>Jan 31. 2011</strong>:This document was changed to reflect that gitorious.org is now operated by Shortcut AS subsidiary Gitorious AS. No changes apart from the company name and address.</p>
+      <p><strong>May 30. 2011</strong>: After discussions with the Free Software Foundation, the paragraphs describing Responsibility of Contributors was updated. The changes are contained in <a href="diffs_20110530.diff">this diff</a>.</p>
 
       <h2>Your Gitorious.org account and site.</h2>
 
@@ -78,14 +79,37 @@
         requested to do so by Gitorious or otherwise.</li>
       </ul>
 
-      <p>By submitting Content to Gitorious for inclusion on the Website, you grant Gitorious a world-wide, perpetual, royalty-free, and non-exclusive license to reproduce, modify,
-      adapt and publish the Content for the purpose of displaying, distributing (hereunder sub-licensing) and promoting your account, project or Content. If you delete Content,
-      Gitorious will use reasonable efforts to remove it from the Website, but you acknowledge that caching or references to the Content may not be made immediately
-      unavailable.</p>
+      <p>
+        As a contributor you shall ensure that the license under which
+        you distribute the Content entitles Gitorious to reproduce and
+        publish the Content as you submit it to Gitorious, or
+        otherwise indemnify Gitorious against any claims or damages
+        awarded due to claims of infringement.
+        By submitting Content to Gitorious, you are responsible for
+        ensuring that such creations do not violate the licensor’s
+        or any third party's license right, property or intellectual
+        property rights.
+        Authors of derived work are responsible for ensuring that the
+        derived Content conforms to the original Content's license(s),
+        regardless of where the original Content is hosted.
+      </p>
+
+      <p>
+        To the extent any Content you contribute requires a patent
+        license to be used, modified, sub-licensed or otherwise for
+        the exercise of rights granted in the applicable license, such
+        patent license shall hereby be deemed as granted by you to
+        users downloading the Content, to the extent you possess such
+        patent rights or right to grant patent license.
+      </p>
+
+      <p>
+        When deleting Content, Gitorious will use reasonable efforts
+        to remove it from the Website, but you acknowledge that due to
+        caching or references the Content may not be made unavailable
+        immediately or at all.
+      </p>
 
-      <p>Without limiting any of those representations or warranties, Gitorious has the right (though not the obligation) in Gitorious’ sole discretion, to (i) refuse or remove any
-      Content that, in Gitorious' reasonable opinion, violates any Gitorious policy, the Agreement or is in any way harmful or objectionable, or (ii) terminate or deny access to
-      and use of the Website to any individual or entity for any reason. Gitorious will have no obligation to provide a refund of any amounts previously paid.</p>
 
       <h2>Responsibility of Website Visitors.</h2>
 
