diff --git a/CHANGELOG b/CHANGELOG
index ac07105..12ab6f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
-version 1.1.0 (xx Jul 2012)
+version 1.1.0 (29 Jul 2012)
+ - fixed the switching from letter to resume, correcting spacing errors when a
+ letter is typeset before the resume (as noticed by Ulrich G.).
  - prepared moderncv for fontspec font loading (still commented in code).
  - changed the handling of the "sans" and "roman" class options, to be reflected
  at the beginning of the document and override style font choices.
diff --git a/examples/template-es.pdf b/examples/template-es.pdf
index c495488..46bdfcc 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 40f476e..3b8e69c 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 99ed473..12d16b2 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 f8f1399..1b2df59 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 a5d79d3..e6c85ff 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 e35576d..a314c50 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 a2621fc..f23e838 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 42c5f0a..5d79fa5 100644
Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ
diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf
index cfc65c1..af41727 100644
Binary files a/examples/template_oldstyle_grey.pdf and b/examples/template_oldstyle_grey.pdf differ
diff --git a/moderncvstylebanking.sty b/moderncvstylebanking.sty
index e63fd57..482ee8f 100644
--- a/moderncvstylebanking.sty
+++ b/moderncvstylebanking.sty
@@ -129,7 +129,7 @@
 \newlength{\listdoubleitemmaincolumnwidth}
 
 % commands
-\renewcommand*{\recomputelengths}{%
+\renewcommand*{\recomputecvlengths}{%
   \setlength{\quotewidth}{0.65\textwidth}%
   % main lenghts
   \setlength{\maincolumnwidth}{\textwidth}%
@@ -142,7 +142,9 @@
   \setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
   \setlength{\listdoubleitemmaincolumnwidth}{0.5\listdoubleitemmaincolumnwidth}%
   % fancyhdr lengths
-  \renewcommand{\headwidth}{\textwidth}}
+  \renewcommand{\headwidth}{\textwidth}%
+  % regular lengths
+  \setlength{\parskip}{0\p@}}
 
 \renewcommand*{\makecvtitle}{%
   % recompute lengths (in case we are switching from letter to resume, or vice versa)
diff --git a/moderncvstylecasual.sty b/moderncvstylecasual.sty
index 39c5f80..8364429 100644
--- a/moderncvstylecasual.sty
+++ b/moderncvstylecasual.sty
@@ -70,6 +70,8 @@
 
 % commands
 \renewcommand*{\makecvtitle}{%
+  % recompute lengths (in case we are switching from letter to resume, or vice versa)
+  \recomputecvlengths%
   % ensure footer with personal information
   \makecvfooter%
   % optional picture
diff --git a/moderncvstyleclassic.sty b/moderncvstyleclassic.sty
index 09862b1..fee6f82 100644
--- a/moderncvstyleclassic.sty
+++ b/moderncvstyleclassic.sty
@@ -93,7 +93,9 @@
   \setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
   \setlength{\listdoubleitemmaincolumnwidth}{0.5\listdoubleitemmaincolumnwidth}%
   % fancyhdr lengths
-  \renewcommand{\headwidth}{\textwidth}}
+  \renewcommand{\headwidth}{\textwidth}%
+  % regular lengths
+  \setlength{\parskip}{0\p@}}
 
 % optional maketitle width to force a certain width (if set to 0pt, the width is calculated automatically)
 \newlength{\makecvtitlenamewidth}
@@ -245,7 +247,7 @@
 %                letter style definition
 %-------------------------------------------------------------------------------
 % commands
-\renewcommand*{\recomputeletterlengths}{
+\renewcommand*{\recomputeletterlengths}{%
   \recomputecvlengths%
   \setlength{\parskip}{6\p@}}
 
diff --git a/moderncvstyleoldstyle.sty b/moderncvstyleoldstyle.sty
index 8e54261..32fec81 100644
--- a/moderncvstyleoldstyle.sty
+++ b/moderncvstyleoldstyle.sty
@@ -87,7 +87,15 @@
 \newlength{\listdoubleitemmaincolumnwidth}
 
 % commands
+\setlength{\marginparwidth}{0\p@}%
+\setlength{\marginparsep}{0\p@}
 \renewcommand*{\recomputecvlengths}{%
+  % regular lengths
+  \changepage{}{+\marginparwidth+\marginparsep}{}{}{}{}{}{}{}% if a letter was typeset before the resume, \marginparwidth and \marginparsep will be non-zero; otherwise, this has no effect
+  \setlength{\marginparwidth}{0\p@}%
+  \setlength{\marginparsep}{0\p@}
+  \setlength{\parskip}{0\p@}%
+  % maketitle lengths
   \setlength{\quotewidth}{0.65\textwidth}%
   % main lenghts
   \setlength{\maincolumnwidth}{\textwidth-\hintscolumnwidth-\separatorcolumnwidth}%
@@ -255,7 +263,7 @@
 % commands
 %\newlength{\textwidthdelta}%
 \renewcommand*{\recomputeletterlengths}{%
-  \recomputecvlengths{}%
+  \recomputecvlengths%
   \setlength{\parskip}{6\p@}%
   \leftskip=0pt%
 %  \setlength{\textwidthdelta}{+\marginparwidth+\marginparsep}%