diff --git a/docs/external.html b/docs/external.html
index a92e0c6a0..dc692a56d 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -2253,7 +2253,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://jegustator.pavelvlasov.com/">http://jegustator.pavelvlasov.com/</a>
+          <a href="http://www.pavelvlasov.com/pv/content/menu.show@id=products.jegustator.html">http://www.pavelvlasov.com/pv/content/menu.show@id=products.jegustator.html</a>
       </td>
       </tr>
                   <tr>
@@ -2263,7 +2263,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="mailto:jegustator@pavelvlasov.com">jegustator@pavelvlasov.com</a>
+          <a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a>
       </td>
       </tr>
                   <tr>
@@ -2956,7 +2956,7 @@
         <a name="Pamda"></a>
         Pamda
       </h4>
-                        <p><a href="http://www.pavelvlasov.com/pv/content/menu.show?id=menu.1.4">Pamda</a>
+                        <p><a href="http://www.pavelvlasov.com/pv/content/menu.show@id=products.pamda.html">Pamda</a>
         is an MDA tool (UML2Code generator) implemented as Ant task. Pamda supports
         Aspect-Oriented Modeling (AOM) and comes with AOM UML Profile and sample project.
         The tool uses XMI as its input and Velocity as template engine. All elements in
@@ -2981,7 +2981,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.pavelvlasov.com/pv/content/menu.show?id=menu.1.4">http://www.pavelvlasov.com/pv/content/menu.show?id=menu.1.4</a>
+          <a href="http://www.pavelvlasov.com/pv/content/menu.show@id=products.pamda.html">http://www.pavelvlasov.com/pv/content/menu.show@id=products.pamda.html</a>
       </td>
       </tr>
                   <tr>
@@ -2991,7 +2991,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.pavelvlasov.com/pv/content/contact.html">Contact Page</a>
+          <a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a>
       </td>
       </tr>
                   <tr>
@@ -3534,7 +3534,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.speech4j.com/">http://www.speech4j.com/</a>
+          <a href="http://www.pavelvlasov.com/pv/content/Products/Speech4j/index.html">http://www.pavelvlasov.com/pv/content/Products/Speech4j/index.html</a>
       </td>
       </tr>
                   <tr>
@@ -3544,7 +3544,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="mailto:support@speech4j.com">support@speech4j.com</a>
+          <a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a>
       </td>
       </tr>
                   <tr>
diff --git a/xdocs/external.xml b/xdocs/external.xml
index ff2dfd3e2..d73e49b11 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -1185,11 +1185,11 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://jegustator.pavelvlasov.com/">http://jegustator.pavelvlasov.com/</a></td>
+            <td><a href="http://www.pavelvlasov.com/pv/content/menu.show@id=products.jegustator.html">http://www.pavelvlasov.com/pv/content/menu.show@id=products.jegustator.html</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
-            <td><a href="mailto:jegustator@pavelvlasov.com">jegustator@pavelvlasov.com</a></td>
+            <td><a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a></td>
           </tr>
           <tr>
             <th>License:</th>
@@ -1592,7 +1592,7 @@
       </subsection>
 
       <subsection name="Pamda">
-        <p><a href="http://www.pavelvlasov.com/pv/content/menu.show?id=menu.1.4">Pamda</a>
+        <p><a href="http://www.pavelvlasov.com/pv/content/menu.show@id=products.pamda.html">Pamda</a>
         is an MDA tool (UML2Code generator) implemented as Ant task. Pamda supports
         Aspect-Oriented Modeling (AOM) and comes with AOM UML Profile and sample project.
         The tool uses XMI as its input and Velocity as template engine. All elements in
@@ -1607,11 +1607,11 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://www.pavelvlasov.com/pv/content/menu.show?id=menu.1.4">http://www.pavelvlasov.com/pv/content/menu.show?id=menu.1.4</a></td>
+            <td><a href="http://www.pavelvlasov.com/pv/content/menu.show@id=products.pamda.html">http://www.pavelvlasov.com/pv/content/menu.show@id=products.pamda.html</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
-            <td><a href="http://www.pavelvlasov.com/pv/content/contact.html">Contact Page</a></td>
+            <td><a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a></td>
           </tr>
           <tr>
             <th>License:</th>
@@ -1900,11 +1900,11 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://www.speech4j.com/">http://www.speech4j.com/</a></td>
+            <td><a href="http://www.pavelvlasov.com/pv/content/Products/Speech4j/index.html">http://www.pavelvlasov.com/pv/content/Products/Speech4j/index.html</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
-            <td><a href="mailto:support@speech4j.com">support@speech4j.com</a></td>
+            <td><a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a></td>
           </tr>
           <tr>
             <th>License:</th>