diff --git a/boards/terms-and-conditions.rst b/boards/terms-and-conditions.rst
index b8c32e1141a3c5eabd7e86e6ed0656045de83c84..fb97253fee7217a41c9c2b01790c18ca0a854d8e 100644
--- a/boards/terms-and-conditions.rst
+++ b/boards/terms-and-conditions.rst
@@ -186,19 +186,26 @@ BeagleBoard.org Foundation
 Oakland Twp, MI 48306 U.S.A.
 
 
-**WARRANTY:** The board assembly as purchased is warranted
-against defects in materials and workmanship for a period of 90 days
-from purchase. This warranty does not cover any problems occurring as a
-result of improper use, modifications, exposure to water, excessive
-voltages, abuse, or accidents. All boards will be returned via standard
-mail if an issue is found. If no issue is found or express return is
-needed, the customer will pay all shipping costs.
+**WARRANTY:** If bought from any of our authorized distributor then 
+the board assembly as purchased is warranted against defects in materials and 
+workmanship for a period of 90 days from purchase. This warranty does not cover 
+any problems occurring as a result of improper use, modifications, exposure to water, 
+excessive voltages, abuse, or accidents. All boards should be returned to the 
+concerning authorized distributor via standard mail if an issue is found. 
+If no issue is found or express return is needed, the customer will pay all shipping costs.
 
 
+.. note:: 
+    Repairs and replacements only provided on unmodified boards purchased via an authorized distributor 
+    within the first 90 days. All repaired board will have their flash reset to factory contents. For 
+    repairs and replacements, please contact 'support' at BeagleBoard.org using the RMA form:
+
+    `RMA request <https://beagleboard.org/support/rma>`_
+
 Before returning the board, please visit
 
 
-BeagleBoard.org/support
+https://BeagleBoard.org/support
 
 
 For up to date SW images and technical information refer to
@@ -210,7 +217,7 @@ BeagleBoard.org forum
 
 
 To return a defective board for repair, please request an RMA at
-beagleboard.org/support/rma
+http://beagleboard.org/support/rma
 
 
 Please DO NOT return the board without approval from the RMA team