diff --git a/CHANGELOG b/CHANGELOG
index dc45e81..1661e1b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+version 0.19 (xx Feb 2012)
+ - reintroduced the ability to force the width reserved to display the name
+ in the resume header for the classic style (\maketitlenamewidth).
+ - improved the pdf metadata, as reported by S. Wunsch (launchpad bug #922476).
+
 version 0.18 (05 Feb 2012)
  - corrected the handling of pdf bookmarks, as suggested on stackexchange by
  U. Fischer.
diff --git a/examples/template-es.pdf b/examples/template-es.pdf
index 274210c..64aa6d5 100644
Binary files a/examples/template-es.pdf and b/examples/template-es.pdf differ
diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf
index 51d4623..662a836 100644
Binary files a/examples/template-zh.pdf and b/examples/template-zh.pdf differ
diff --git a/examples/template.pdf b/examples/template.pdf
index 4b361f2..a704cdf 100644
Binary files a/examples/template.pdf and b/examples/template.pdf differ
diff --git a/examples/template_banking_black.pdf b/examples/template_banking_black.pdf
index 46ac5c5..1b10c76 100644
Binary files a/examples/template_banking_black.pdf and b/examples/template_banking_black.pdf differ
diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf
index 045d4cf..7143db7 100644
Binary files a/examples/template_banking_red.pdf and b/examples/template_banking_red.pdf differ
diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf
index 80158ed..452996d 100644
Binary files a/examples/template_casual_orange.pdf and b/examples/template_casual_orange.pdf differ
diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf
index 659980c..bcfcdbc 100644
Binary files a/examples/template_classic_green.pdf and b/examples/template_classic_green.pdf differ
diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf
index 5906a4d..d5d4aa2 100644
Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ
diff --git a/moderncv.cls b/moderncv.cls
index 5b839b9..c8e5a1a 100644
--- a/moderncv.cls
+++ b/moderncv.cls
@@ -111,14 +111,14 @@
       pdfpagemode   = UseNone,% do not show thumbnails or bookmarks on opening
       pdfpagelabels = false,% to avoid a warning setting it automatically to false anyway, because hyperref detects \thepage as undefined (why?)
       pdfstartpage  = 1,
-      pdfcreator    = \LaTeX{} with `moderncv' package,
-      pdfproducer   = \LaTeX{},
+      pdfcreator    = {\LaTeX{} with `moderncv' package},
+%      pdfproducer   = {\LaTeX{}},% will/should be set automatically to the correct TeX engine used
       bookmarksopen = true,
       bookmarksdepth= 2,% to show sections and subsections
-      pdfauthor     = \@firstname~\@familyname,
-      pdftitle      = \@title,
-      pdfsubject    = \@firstname~\@familyname,
-      pdfkeywords   = \@firstname~\@familyname{} curriculum vit\ae{}}
+      pdfauthor     = {\@firstname{}~\@familyname{}},
+      pdftitle      = {\@firstname{}~\@familyname{} -- \@title{}},
+      pdfsubject    = {Resum\'{e} of \@firstname{}~\@familyname{}},
+      pdfkeywords   = {\@firstname{}~\@familyname{}, curriculum vit\ae{}, resum\'{e}}}
   \pagenumbering{arabic}% has to be issued after loading hyperref
 }