diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index 31e0c35..1580344 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -45,10 +45,7 @@ under the License.
         </p>
         <ol>
           <li>
-            File bugs with the projects that produced those artifacts to get them to fix them.  Also,
-            file bugs with the
-            <a href="https://issues.apache.org/jira/browse/MEV">Maven Evangelism</a>
-            project to have the Maven people enhance the metadata in the repository.
+            File bugs with the projects that produced those artifacts to get them to fix them.
           </li>
           <li>
             Use a supplemental data file.  You can create a file that contains the missing metadata.
@@ -67,7 +64,7 @@ under the License.
                     <licenses>
                       <license>
                         <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
-                        <url>http://www.sun.com/cddl/cddl.html</url>
+                        <url>https://oss.oracle.com/licenses/CDDL</url>
                       </license>
                     </licenses>
                   </project>
@@ -82,4 +79,4 @@ under the License.
       </answer>
     </faq>
   </part>
-</faqs>
\ No newline at end of file
+</faqs>