diff --git a/ptbletter/ptbletter-doc.pdf b/ptbletter/ptbletter-doc.pdf
index 3f014999de2f88d19953a031de9bb093f0c35d35..f36a9029611662e50b98e25b3ff50dcf4fb9d33f 100644
Binary files a/ptbletter/ptbletter-doc.pdf and b/ptbletter/ptbletter-doc.pdf differ
diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls
index ca03f06f6955a52b4e1f3f657c454adbd7b31096..96311927c3ee65d4205a3191d2d846161e437a3c 100644
--- a/ptbletter/ptbletter.cls
+++ b/ptbletter/ptbletter.cls
@@ -3,7 +3,7 @@
 \setcounter{errorcontextlines}{100}  \listfiles
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{ptbletter}[2018/01/17 v0.3a-pre PTB-Brief-Klasse (RN)]
+\ProvidesClass{ptbletter}[2018/01/17 v0.3a PTB-Brief-Klasse (RN)]
 
 \let\ptb@tempdima=\@ovxx
 \let\ptb@tempdimb=\@ovyy
@@ -114,7 +114,8 @@
 \RequirePackage{etoolbox,iflang,trimspaces}
 \AtEndPreamble{%
   \IfLanguageName{ngerman}{
-    \RequirePackage[babel=once,german=guillemets]{csquotes}
+    \AtEndOfClass{\shorthandon{"}}
+    \RequirePackage[autostyle=true,german=guillemets,maxlevel=3]{csquotes}%
   }{%
     \RequirePackage[babel=once]{csquotes}
     \useshorthands*{"}
@@ -124,6 +125,13 @@
   \defineshorthand{"'}{\closeautoquote}
 }
 
+\AtEndOfClass{%
+  \@ifpackageloaded{inputenc}{}{%
+    \catcode`\»=\active
+    \catcode`\«=\active
+  }%
+}
+
 %%%\AtEndOfClass{\shorthandon{"}}
 
 \@setplength{toaddrhpos}{72bp}