Index: /applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml
===================================================================
--- /applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 30715)
+++ /applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 30716)
@@ -2,5 +2,5 @@
 <!-- 
 //    JOSM tag2link plugin.
-//    Copyright (C) 2011 Don-vip & FrViPofm
+//    Copyright (C) 2011-2014 Don-vip & FrViPofm
 //
 //    This program is free software: you can redistribute it and/or modify
@@ -45,6 +45,6 @@
     <src name="WHC">
         <rule>
-            <condition k="ref:whc" v="[0-9-]+" />
-            <link name="View UNESCO sheet" href="http://whc.unesco.org/%lang(en,fr):en%/list/%v%" />
+            <condition k="ref:whc" v="([0-9]+)(?:-.*)?" />
+            <link name="View UNESCO sheet" href="http://whc.unesco.org/%lang(en,fr):en%/list/%v.1%" />
         </rule>
     </src>
@@ -101,5 +101,5 @@
         <rule>
             <condition k="ref:(FR:)?CEF" v="[A-Z0-9_]{8}" />
-            <link name="View %name% sheet of church" href="http://www.messesinfo.catholique.fr/public/fiche.php?valcode=%v%" />
+            <link name="View %name% sheet of church" href="http://egliseinfo.catholique.fr/#!lieu:%v%" />
         </rule>
     </src>
@@ -139,18 +139,39 @@
     </src>
 
-    <src name="Education Nationale" country-code="FR">
+    <src name="Éducation Nationale" country-code="FR">
         <rule>
             <condition k="ref:(FR:)?UAI" />
-            <link name="View UAI sheet of school/college" href="http://www.education.gouv.fr/bce/avancee/fiche.php?NUMERO_UAI=%v%&amp;type_info=UAI_all" />
+            <link name="View UAI sheet of school/college" href="http://www.education.gouv.fr/pid24302/annuaire-resultat-recherche.html?lycee_name=%v%" />
         </rule>
     </src>
 
-    <!-- social facility --> 
+    <!-- social facility -->
     <src name="FINESS" country-code="FR">
         <rule>
-            <condition k="ref:(FR:)?FINESS" v="[A-Z0-9-]{9}" />
+            <condition k="ref:(FR:)?FINESS" v="[A-Z0-9-]{8,9}" />
             <link name="View %name% sheet of hospital/home" href="http://finess.sante.gouv.fr/finess/jsp/actionDetailEtablissement.do?noFiness=%v%" />
         </rule>
     </src>
-    
+
+    <src name="NAF" country-code="FR">
+        <rule>
+            <condition k="ref:FR:NAF" v="[A-Z0-9-]{5}" />
+            <link name="View explanation of %name% code" href="http://www.rouen.cci.fr/outils/ape/Naf_liste.asp?param=2&amp;code=%v%" />
+        </rule>
+    </src>
+
+    <src name="SIRET" country-code="FR">
+        <rule>
+            <condition k="ref:FR:SIRET" v="(\p{Digit}{9})([0-9-]{5})" />
+            <link name="Get identification card (pdf) for this establishment" href="http://avis-situation-sirene.insee.fr/avisitu/AvisPdf.do?nic=%v.2%&amp;siren=%v.1%" />
+        </rule>
+    </src>
+
+    <src name="La Poste" country-code="FR">
+        <rule>
+            <condition k="ref:FR:LaPoste" v="[0-9]{5}[A-Z]" />
+            <link name="View %name% page of this post office" href="http://www.laposte.fr/particulier/outils/trouver-un-bureau-de-poste/bureau-detail/%v%/%v%" />
+        </rule>
+    </src>
+
 </tag2link>