diff --git a/_data/rules.yml b/_data/rules.yml
index f1be24a..57400b6 100644
--- a/_data/rules.yml
+++ b/_data/rules.yml
@@ -31,6 +31,15 @@ conditions:
 - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
   label: Same License
   tag: same-license
+- description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+  label: Same License (File)
+  tag: same-license--file
+- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library.
+  label: Same License (Library)
+  tag: same-license--library
+- description: Modifications must be released under the same license when distributing the software in source form.
+  label: Same License (Source)
+  tag: same-license--source
 
 limitations:
 - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt
index 80712e9..5a5b6c4 100644
--- a/_licenses/epl-1.0.txt
+++ b/_licenses/epl-1.0.txt
@@ -24,7 +24,7 @@ permissions:
 conditions:
   - disclose-source
   - include-copyright
-  - same-license
+  - same-license--source
 
 limitations:
   - liability
diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt
index 7dbfc2a..d1224d0 100644
--- a/_licenses/lgpl-2.1.txt
+++ b/_licenses/lgpl-2.1.txt
@@ -22,7 +22,7 @@ conditions:
   - include-copyright
   - disclose-source
   - document-changes
-  - same-license
+  - same-license--library
 
 limitations:
   - liability
diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt
index b7fd1dd..cea10cb 100644
--- a/_licenses/lgpl-3.0.txt
+++ b/_licenses/lgpl-3.0.txt
@@ -23,7 +23,7 @@ conditions:
   - include-copyright
   - disclose-source
   - document-changes
-  - same-license
+  - same-license--library
 
 limitations:
   - liability
diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt
index ec461ce..7da98da 100644
--- a/_licenses/mpl-2.0.txt
+++ b/_licenses/mpl-2.0.txt
@@ -26,7 +26,7 @@ permissions:
 conditions:
   - disclose-source
   - include-copyright
-  - same-license
+  - same-license--file
 
 limitations:
   - liability
diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt
index db4fb67..18ab1ca 100644
--- a/_licenses/ms-rl.txt
+++ b/_licenses/ms-rl.txt
@@ -17,7 +17,7 @@ permissions:
 conditions:
   - disclose-source
   - include-copyright
-  - same-license
+  - same-license--file
 
 limitations:
   - warranty
diff --git a/appendix.md b/appendix.md
index a28f3be..316c6bd 100644
--- a/appendix.md
+++ b/appendix.md
@@ -17,7 +17,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f
   {% for type in types %}
     {% assign rules = site.data.rules[type] | sort: "label" %}
     {% for rule_obj in rules %}
-      {% if seen_tags contains rule_obj.tag %}
+      {% if seen_tags contains rule_obj.tag or rule_obj.tag contains '--' %}
         {% continue %}
       {% endif %}
       {% capture seen_tags %}{{ seen_tags | append:rule_obj.tag }}{% endcapture %}
@@ -33,20 +33,22 @@ If you're here to choose a license, **[start from the home page](/)** to see a f
     {% assign rules = site.data.rules[type] | sort: "label" %}
     {% for rule_obj in rules %}
       {% assign req = rule_obj.tag %}
-      {% if seen_tags contains req %}
+      {% if seen_tags contains req  or rule_obj.tag contains '--' %}
         {% continue %}
       {% endif %}
       {% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %}
       {% assign seen_req = false %}
       {% for t in types %}
-        {% if license[t] contains req %}
-          <td class="license-{{ t }}" style="text-align:center">
-            <span class="{{ req }}">
-              <span class="license-sprite {{ req }}"></span>
-            </span>
-          </td>
-          {% assign seen_req = true %}
-        {% endif %}
+        {% for r in license[t] %}
+          {% if r contains req %}
+            <td class="license-{{ t }}" style="text-align:center">
+              <span class="{{ r }}">
+                <span class="license-sprite {{ r }}"></span>
+              </span>
+            </td>
+            {% assign seen_req = true %}
+          {% endif %}
+        {% endfor %}
       {% endfor %}
       {% unless seen_req %}
         <td></td>