diff --git a/linuxdoc-tools/lib/fmt/fmt_latex2e.pl b/linuxdoc-tools/lib/fmt/fmt_latex2e.pl

index 050cf06..159790e 100644

--- a/linuxdoc-tools/lib/fmt/fmt_latex2e.pl

+++ b/linuxdoc-tools/lib/fmt/fmt_latex2e.pl

@@ -10,7 +10,7 @@

 #  Copyright © 1999, Kazuyuki Okamoto (euc-jp support in sgml2txt, sgml2html, and sgml2latex)

 #  Copyright © 1999, Tetsu ONO (euc-jp support in sgml2txt, sgml2html, and sgml2latex)

 #  Copyright © 2000, Juan Jose Amor (Support for PDF files)

-#  Copyright © 2006-2009, Agustin Martin

+#  Copyright © 2006-2016, Agustin Martin

 # ------------------------------------------------------------------

 package LinuxDocTools::fmt_latex2e;

@@ -284,11 +284,11 @@ $latex2e->{postASP} = sub

       push @texlines, $_;

       # and check for nameurl

       if ( /\\nameurl/ ){

-	($urlid, $urlnam) = ($_ =~ /\\nameurl{(.*)}{(.*)}/);

+	($urlid, $urlnam) = ($_ =~ /\\nameurl\{(.*)\}\{(.*)\}/);

 	print $urlnum . ": " . $urlid . "\n" if ( $global->{debug} );

 	$urldef = latex2e_defnam($urlnum) . "url";

-	s/\\nameurl{.*}{.*}/{\\em $urlnam} {\\tt \\$urldef}/;

+	s/\\nameurl\{.*\}\{.*\}/\\emph{$urlnam} \\texttt{\\$urldef}/;

 	push @urlnames, $_;

 	push @urldefines, "\\urldef{\\$urldef} \\url{$urlid}\n";

 	$urlnum++;

@@ -367,12 +367,12 @@ $latex2e->{postASP} = sub

 	    $_ = $_ . "\\makeindex\n" if ($latex2e->{makeindex});

 	  }

 	  # Set correct DTD name

-	  elsif (/^\\usepackage{\@LINUXDOC_DTD\@-sgml}/) {

+	  elsif (/^\\usepackage\{\@LINUXDOC_DTD\@-sgml\}/) {

 	    my $dtd = $global->{"dtd"};

 	    s/\@LINUXDOC_DTD\@/$dtd/;

 	  }

 	  # Set correct babel options

-	  elsif (/^\\usepackage\[\@BABELOPTIONS\@\]{babel}/) {

+	  elsif (/^\\usepackage\[\@BABELOPTIONS\@\]\{babel\}/) {

 	    if ( $babeloptions ) {

 	      s/\@BABELOPTIONS\@/$babeloptions/;

 	    } else {