diff --git a/development/checkurls/inaccessibleURLS b/development/checkurls/inaccessibleURLS
index c228bd2c85..a5ab84558d 100644
--- a/development/checkurls/inaccessibleURLS
+++ b/development/checkurls/inaccessibleURLS
@@ -1,5 +1,2 @@
-#Net::HTTP: Bad hostname 'math.tulane.edu'
-http://math.tulane.edu/~entcs/
-# not found
-ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/koma-script/scrguien.pdf
-ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/koma-script/scrguide.pdf
\ No newline at end of file
+# No entry here means, there are no inaccessible
+# urls used in our lyx-source
diff --git a/development/checkurls/search_url.pl b/development/checkurls/search_url.pl
index 0e75bb3b5b..8de23242d7 100755
--- a/development/checkurls/search_url.pl
+++ b/development/checkurls/search_url.pl
@@ -40,8 +40,9 @@ BEGIN  {
 
 use CheckURL;
 
-$ENV{LANG} = "en";
-$ENV{LANGUAGE} = "en";
+$ENV{LC_ALL} = "en_US.UTF-8";
+$ENV{LANG} = "en_US.UTF-8";
+$ENV{LANGUAGE} = "en_US.UTF-8";
 
 my %URLS = ();
 my %ignoredURLS = ();
@@ -87,14 +88,14 @@ my $errorcount = 0;
 my $URLScount = 0;
 
 for my $u (@urls) {
+  if (defined($selectedURLS{$u})) {
+    ${selectedURLS}{$u}->{count} += 1;
+  }
   if (defined($ignoredURLS{$u})) {
-    $ignoredURLS{$u} += 1;
+    $ignoredURLS{$u}->{count} += 1;
     next;
   }
-  next if ($checkSelectedOnly && ! defined(${selectedURLS}{$u}));
-  if (defined(${selectedURLS}{$u})) {
-    ${selectedURLS}{$u} += 1;
-  }
+  next if ($checkSelectedOnly && ! defined($selectedURLS{$u}));
   $URLScount++;
   print "Checking '$u'";
   my $res = &check_url($u);
@@ -130,8 +131,11 @@ for my $u (@urls) {
   }
 }
 
-&printNotUsedURLS("Ignored", \%ignoredURLS);
-&printNotUsedURLS("Selected", \%selectedURLS);
+if (%URLS) {
+  &printNotUsedURLS("Ignored", \%ignoredURLS);
+  &printNotUsedURLS("Selected", \%selectedURLS);
+  &printNotUsedURLS("KnownInvalid", \%extraURLS);
+}
 
 print "\n$errorcount URL-tests failed out of $URLScount\n\n";
 exit($errorcount);
@@ -143,8 +147,13 @@ sub printNotUsedURLS($$)
   my ($txt, $rURLS) = @_;
   my @msg = ();
   for my $u ( sort keys %{$rURLS}) {
-    if ($rURLS->{$u} < 2) {
-      push(@msg, $u);
+    if ($rURLS->{$u}->{count} < 2) {
+      my @submsg = ();
+      for my $f (sort keys %{$rURLS->{$u}}) {
+	next if ($f eq "count");
+	push(@submsg, "$f:" . $rURLS->{$u}->{$f});
+      }
+      push(@msg, "\n  $u\n    " . join("\n    ", @submsg) . "\n");
     }
   }
   if (@msg) {
@@ -157,11 +166,15 @@ sub readUrls($$)
   my ($file, $rUrls) = @_;
 
   die("Could not read file $file") if (! open(ULIST, $file));
+  my $line = 0;
   while (my $l = <ULIST>) {
+    $line++;
     $l =~ s/[\r\n]+$//;		# remove eol
     $l =~ s/\s*\#.*$//;		# remove comment
     next if ($l eq "");
-    $rUrls->{$l} = 1;
+    if (! defined($rUrls->{$l} )) {
+      $rUrls->{$l} = {$file => $line, count => 1};
+    }
   }
   close(ULIST);
 }
@@ -169,7 +182,7 @@ sub readUrls($$)
 sub parse_file($)
 {
   my($f) = @_;
-  my $status = "out";		# outside of URL
+  my $status = "out";		# outside of URL/href
 
   return if ($f =~ /\/attic\//);
   if(open(FI, $f)) {
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 9c32fb4940..315477467b 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -45217,7 +45217,7 @@ Documentation of the LaTeX-package
 \begin_inset CommandInset href
 LatexCommand href
 name "KOMA-Script"
-target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/koma-script/scrguien.pdf"
+target "http://mirror.ctan.org/macros/latex/contrib/koma-script/scrguien.pdf"
 
 \end_inset
 
diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index a537887188..73979e58b7 100644
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -2700,7 +2700,7 @@ status collapsed
 
 \begin_layout Plain Layout
 
-http://math.tulane.edu/~entcs/
+http://www.entcs.org/generic.zip
 \end_layout
 
 \end_inset
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 72d29b6466..44a78259e8 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -45273,7 +45273,7 @@ Dokumentation des LaTeX-Pakets
 \begin_inset CommandInset href
 LatexCommand href
 name "KOMA-Script"
-target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/koma-script/scrguide.pdf"
+target "http://mirror.ctan.org/macros/latex/contrib/koma-script/scrguien.pdf"
 
 \end_inset
 
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index ee19c7ba29..c4a5da5a8d 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -44579,7 +44579,7 @@ Documentación del paquete LaTeX
 \begin_inset CommandInset href
 LatexCommand href
 name "KOMA-Script"
-target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/koma-script/scrguien.pdf"
+target "http://mirror.ctan.org/macros/latex/contrib/koma-script/scrguien.pdf"
 
 \end_inset
 
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index 7cd472681b..c15591f621 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -46371,7 +46371,7 @@ Documentation du paquetage LaTeX
 \begin_inset CommandInset href
 LatexCommand href
 name "KOMA-Script"
-target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/koma-script/scrguien.pdf"
+target "http://mirror.ctan.org/macros/latex/contrib/koma-script/scrguien.pdf"
 
 \end_inset
 
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index a8740a1490..6752f0983f 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -41721,7 +41721,7 @@ LaTeXパッケージ
 \begin_inset CommandInset href
 LatexCommand href
 name "KOMA-script"
-target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/koma-script/scrguien.pdf"
+target "http://mirror.ctan.org/macros/latex/contrib/koma-script/scrguien.pdf"
 
 \end_inset
 
diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx
index fe2ea9fd58..8c9a928114 100644
--- a/lib/doc/ja/LaTeXConfig.lyx
+++ b/lib/doc/ja/LaTeXConfig.lyx
@@ -2439,7 +2439,7 @@ status collapsed
 
 \begin_layout Plain Layout
 
-http://math.tulane.edu/~entcs/
+http://www.entcs.org/generic.zip
 \end_layout
 
 \end_inset