diff --git a/mediagoblin/templates/mediagoblin/terms_of_service.html b/mediagoblin/templates/mediagoblin/terms_of_service.html
index a9e8ebf2..4247f5b8 100644
--- a/mediagoblin/templates/mediagoblin/terms_of_service.html
+++ b/mediagoblin/templates/mediagoblin/terms_of_service.html
@@ -74,17 +74,20 @@ available only to individuals who are at least 13 years old.
     constitutes text, graphics, an audio file, or computer software. By making
     Content available, you represent and warrant that:
     <ul class="nested_sublist">
-      <li>the downloading, copying and use of the Content will not infringe
+      <li>
+        the downloading, copying and use of the Content will not infringe
         the proprietary rights, including but not limited to the copyright,
         patent, trademark or trade secret rights, of any third party;
       </li>
-      <li>if your employer has rights to intellectual property you create, you
-        have either (i) received permission from your employer to post or make
-        available the Content, including but not limited to any software, or
-        (ii) secured from your employer a waiver as to all rights in or to the
-        Content;
+      <li>
+        if your employer has rights to any copyrights, patents, or trademarks
+        you create, you have either (i) received permission from your employer
+        to post or make available the Content, including but not limited to any
+        software, or (ii) secured from your employer a waiver as to all rights
+        in or to the Content;
       </li>
-      <li>you have fully complied with any third-party licenses relating to the
+      <li>
+        you have fully complied with any third-party licenses relating to the
         Content, and have done all things necessary to successfully pass
         through to end users any required terms;
       </li>
@@ -150,7 +153,7 @@ available only to individuals who are at least 13 years old.
     indecent, or otherwise objectionable, as well as content containing
     technical inaccuracies, typographical mistakes, and other errors. The
     Website may also contain material that violates the privacy or publicity
-    rights, or infringes the intellectual property and other proprietary
+    rights, or infringes the copyright, patent, trademark and other proprietary
     rights, of third parties, or the downloading, copying or use of which is
     subject to additional terms and conditions, stated or unstated. Operator
     disclaims any responsibility for any harm resulting from the use by
@@ -171,29 +174,31 @@ available only to individuals who are at least 13 years old.
     disclaims any responsibility for any harm resulting from your use of
     external websites and webpages.
   </li>
-  <li><strong>Copyright Infringement and DMCA Policy.</strong> As Operator asks
-    others to
-    respect its intellectual property rights, it respects the intellectual
-    property rights of others. If you believe that material located on or
-    linked to by {{ app_config['html_title'] }} violates your copyright, you
-    are encouraged to notify Operator in accordance with Operator’s Digital
-    Millennium Copyright Act (”DMCA”) Policy. Operator will respond to all
-    such notices, including as required or appropriate by removing the
-    infringing material or disabling all links to the infringing material. In
-    the case of a visitor who may infringe or repeatedly infringes the
-    copyrights or other intellectual property rights of Operator or others,
-    Operator may, in its discretion, terminate or deny access to and use of
-    the Website. In the case of such termination, Operator will have no
-    obligation to provide a refund of any amounts previously paid to Operator.
-  </li>
-  <li><strong>Intellectual Property.</strong> This Agreement does not transfer
-    from Operator to
-    you any Operator or third party intellectual property, and all right,
-    title and interest in and to such property will remain (as between the
+  <li>
+    <strong>Copyright Infringement and DMCA Policy.</strong>
+    As Operator asks others to respect its copyrights and trademark rights,
+    it respects the copyright, patent, and trademark rights of others.
+    If you believe that material located on or linked to by
+    {{ app_config['html_title'] }} violates your copyright, you are encouraged
+    to notify Operator in accordance with Operator’s Digital Millennium
+    Copyright Act (”DMCA”) Policy. Operator will respond to all such notices,
+    including as required or appropriate by removing the infringing material or
+    disabling all links to the infringing material. In the case of a visitor who
+    may infringe or repeatedly infringes the copyrights or other trademark or
+    patent rights of Operator or others, Operator may, in its discretion,
+    terminate or deny access to and use of the Website. In the case of such
+    termination, Operator will have no obligation to provide a refund of any
+    amounts previously paid to Operator.</li>
+  <li>
+    <strong>Copyrights, patents, and trademarks.</strong>
+    This Agreement does not transfer from Operator to
+    you any Operator or third party copyrights, patents, or trademarks,
+    and all right, title and interest in and to such copyrights, patents,
+    and trademarks will remain (as between the
     parties) solely with Operator. {{ app_config['html_title'] }}, the
     {{ app_config['html_title'] }} logo, and all other trademarks, service
     marks, graphics and logos used in connection with
-    {{ app_config['html_title'] }}, or the Website are trademarks or
+    {{ app_config['html_title'] }}, or the Website may be trademarks or
     registered trademarks of Operator or Operator’s licensors. Other
     trademarks, service marks, graphics and logos used in connection with the
     Website may be the trademarks of other third parties. Your use of the
@@ -253,15 +258,16 @@ available only to individuals who are at least 13 years old.
     conduct and acceptable content, and including all applicable laws regarding
     the transmission of technical data exported from the United States or the
     country in which you reside) and (ii) your use of the Website will not
-    infringe or misappropriate the intellectual property rights of any third
-    party.
+    infringe or misappropriate the copyrights, patents, and trademark rights of
+    any third party.
   </li>
-  <li><strong>Indemnification.</strong> You agree to indemnify and hold
-    harmless Operator, its
-    contractors, and its licensors, and their respective directors, officers,
-    employees and agents from and against any and all claims and expenses,
-    including attorneys’ fees, arising out of your use of the Website,
-    including but not limited to out of your violation this Agreement.
+  <li>
+    <strong>Indemnification.</strong>
+    You agree to indemnify and hold harmless Operator, its contractors, and its
+    licensors, and their respective directors, officers, employees and agents
+    from and against any and all claims and expenses, including attorneys’ fees,
+    arising out of your use of the Website, including but not limited to out of
+    your violation this Agreement.
   </li>
   <li><strong>Miscellaneous.</strong> This Agreement constitutes the entire
     agreement between