diff --git a/antragsbestaetigung/ptb-confirm-de.lco b/antragsbestaetigung/ptb-confirm-de.lco
index 1099c52e485bfe6fac26ad8484bf163492c34d65..ca34b67836dc4d3724d60a0f8747995b7252d58f 100644
--- a/antragsbestaetigung/ptb-confirm-de.lco
+++ b/antragsbestaetigung/ptb-confirm-de.lco
@@ -1,4 +1,4 @@
-\ProvidesFile{ptb-confirm-de.lco}[2015/05/26 v0.1a (ptb-confirm.cls, german)]
+\ProvidesFile{ptb-confirm-de.lco}[2015/05/26 v0.1a (ptb-confirm, german)]
 
 \makeatletter
 
diff --git a/antragsbestaetigung/ptb-confirm-en.lco b/antragsbestaetigung/ptb-confirm-en.lco
index c45cb76219793e6f33107b2206365a421628f86f..d2387708730cb44d91dd2b93bbae48c30647ee36 100644
--- a/antragsbestaetigung/ptb-confirm-en.lco
+++ b/antragsbestaetigung/ptb-confirm-en.lco
@@ -1,4 +1,4 @@
-\ProvidesFile{ptb-confirm-en.lco}[2015/05/26 v0.1a (ptb-confirm.cls, englisch)]
+\ProvidesFile{ptb-confirm-en.lco}[2015/05/26 v0.1a (ptb-confirm, englisch)]
 
 \makeatletter
 
diff --git a/erklaerung/declaration.cls b/erklaerung/declaration.cls
deleted file mode 100644
index 7c0dcb7727e129ce27de72808d9af5e786a3117c..0000000000000000000000000000000000000000
--- a/erklaerung/declaration.cls
+++ /dev/null
@@ -1 +0,0 @@
-\endinput
diff --git a/erklaerung/ptb-declaration-de.clo b/erklaerung/ptb-declaration-de.clo
new file mode 100644
index 0000000000000000000000000000000000000000..149dcfac3a4379495bec6d65c95181c8e8179774
--- /dev/null
+++ b/erklaerung/ptb-declaration-de.clo
@@ -0,0 +1,73 @@
+
+\ProvidesFile{ptb-declaration-de.clo}[2015/05/27 v0.1a (ptb-declaration, german)]
+
+\mbox{}
+\vspace{-1cm}
+\begin{center}
+  \usekomafont{disposition} \huge Erklärung
+\end{center}
+
+\begin{tabular}{@{}ll@{}}
+  Bitte senden an: &
+  \begin{minipage}[t]{10cm}
+    Arbeitsgruppe Vakuummetrologie \\
+    Physikalisch-Technische Bundesanstalt \\
+    Abbestraße 2--12 \\
+    10587 Berlin
+  \end{minipage}
+\end{tabular}
+
+oder per Fax an \vl@myfax{} oder E-Mail an \vl@myemail{} oder dem Gerät beilegen.
+
+\medskip
+\makeatletter
+\textbf{Bezug:}~\parbox[t]{10cm}{PTB-Reg.-Nr.:~\vl@myref~~vom~~\vl@mymail \\
+                                 Unsere Auftragsnummer:}
+\makeatother
+
+\medskip
+Wir versichern, dass die zur Kalibrierung eingereichten Vakuummessgeräte oder
+Testlecks (inklusive Vakuumbauteile)
+\begin{itemize}
+  \item nicht mit toxischen, ätzenden, explosiven, radioaktiven,
+  mikrobiologischen oder sonstigen Schadstoffen kontaminiert sind,
+  \item vor dem Versand an die PTB einer Funktionsprüfung unterzogen wurden,
+  \item sich in einem den allgemeinen Regeln der Hoch- und
+  Ultrahochvakuumtechnik entsprechenden Zustand befinden,
+  \item eine Verunreinigung der Kalibrieranlagen der PTB ausgeschlossen ist
+  (z.\,B.\ durch Öle und Crackprodukte),
+  \item aus messtechnischer Sicht kalibrierfähig sind,
+  \item die einschlägigen Unfallverhütungsvorschriften (UVV) und die
+  anerkannten Regeln der Technik beachtet wurden und
+  \item uns keine Umstände bekannt sind, die einer Kalibrierung entgegenstehen
+  könnten.
+\end{itemize}
+
+Der Transport der Geräte soll in der folgenden Weise geschehen\footnote{%
+  Kosten in Bezug auf den Transport und Zollabfertigung sind durch den Kunden zu
+  tragen. Für Geräte aus anderen Zollgebieten ist ein Carnet notwendig.}:
+
+\begin{itemize} \renewcommand*\labelitemi{$\Box$~}
+  \item Bitte beauftragen Sie das von der PTB bevorzugte
+  Speditions-/Postunternehmen. Die Geräte sind nicht versichert.
+  \item (bevorzugt) Wir werden unser eigenes Speditionsunternehmen beauftragen.
+  Die PTB informiert uns, wenn unsere Geräte abholbereit sind.
+  \item Bitte beauftragen Sie folgendes Speditions-/Postunternehmen: Unsere
+  Kundennummer\footnote{%
+    Bitte stellen Sie sicher, dass die Kundennummer für den Rücktransport gültig ist.
+  } bei diesem Unternehmen:
+
+\end{itemize}
+
+\vfill
+
+\begin{tabularx}{\textwidth}{@{}C{.15\textwidth}C{.15\textwidth}YY@{}}
+  \multicolumn{2}{@{}c}{\hrulefill} \\
+  \multicolumn{2}{@{}c}{Institution\,/\,Firma} \\[1.6em]
+  \hrulefill & \hrulefill & \hrulefill & \hrulefill \\
+  Ort & Datum & Firmenstempel & rechtsverbindliche Unterschrift/en
+\end{tabularx}
+
+\vspace{3mm}
+
+\endinput
diff --git a/erklaerung/ptb-declaration-en.clo b/erklaerung/ptb-declaration-en.clo
new file mode 100644
index 0000000000000000000000000000000000000000..ea4d7507d968c7e28028c6355343b63861aca25b
--- /dev/null
+++ b/erklaerung/ptb-declaration-en.clo
@@ -0,0 +1,84 @@
+
+\ProvidesFile{ptb-declaration-en.clo}[2015/05/27 v0.1a (ptb-declaration, english)]
+
+  \mbox{}
+  \vspace{-1cm}
+  \begin{center}
+    \usekomafont{disposition} \huge Declaration
+
+  \end{center}
+
+  \begin{tabular}{@{}ll@{}}
+    To be mailed to: &
+    \begin{minipage}[t]{10cm}
+      Section Vacuum Metrology \\
+      Physikalisch-Technische Bundesanstalt \\
+      Abbestraße 2--12 \\
+      10587 Berlin, Germany
+    \end{minipage}
+  \end{tabular}
+
+  or faxed to \vl@myfax{} or email to \vl@myemail{}; may also be
+  sent with instrument.
+
+  \medskip
+  \makeatletter
+  \textbf{Subject:}~\parbox[t]{15cm}{Reg. No. (PTB):~\vl@myref~~Date of confirmation:~\vl@mymail \\
+              Our order no. (if applicable):}
+  \makeatother
+
+  \medskip
+  This is to certify that the vacuum gauges and/or test leaks (including their
+  vacuum components) which we ordered to being calibrated by PTB
+  \begin{itemize}
+    \item are not contaminated with toxical, corrosive, explosive, radioactive,
+    microbiological or other harmful substances,
+    \item were investigated referring to their operational function before
+    shipment to PTB,
+    \item leave our house in a condition according to the general rules of high
+    and ultrahigh vacuum techniques (not applicable for sniffer leaks) and in a
+    condition that a contamination of the PTB calibration standards can be
+    excluded (e.\,g.\ by oil or other hydrocarbons),
+    \item are ready for calibration from the metrological point of view,
+    \item obey the general rules of prevention of accidents and the
+    acknowledged rules of relevant techniques and
+    \item we have no knowledge of any indication of obstacles to a calibration.
+  \end{itemize}
+
+  Transport shall be organised in the following manner\footnote{%
+    Any costs related to transport and customs clearance have to be paid by
+    PTB's customer. For equipment from customs area outside EU an ATA carnet is
+    required.}:
+
+  \begin{itemize} \renewcommand*\labelitemi{$\Box$~}
+    \item (Preferred) We will give order to our own shipping agent to pick up
+    the devices at PTB\footnote{%
+      Please tick here, if you expect classification as transport of hazardous
+      goods (delay of about one 1 week)
+    }. PTB will inform us, when the devices are ready for shipment. \par
+    Please, inform:~\raisebox{-.4em}{\parbox{4cm}{\hrulefill}}~(email).
+
+    \item Please, use the regular PTB shipping agent (PTB cannot insure transport!).
+
+    \item Please, use the following carrier\footnote{%
+      If customs clearance is necessary, it may not be possible to use your
+      carrier chosen. In normal cases, customs clearance has to be made by the
+      local carrier that organised the local transport to PTB.
+    }: \par
+    Our customer number\footnote{%
+      Please take care that the number given is valid for transport from abroad.
+    } at this carrier:
+  \end{itemize}
+
+  \vfill
+
+  \begin{tabularx}{\textwidth}{@{}C{.15\textwidth}C{.15\textwidth}YY@{}}
+    \multicolumn{2}{@{}c}{\hrulefill} \\
+    \multicolumn{2}{@{}c}{Institution\,/\,Company} \\[1.6em]
+    \hrulefill & \hrulefill & \hrulefill & \hrulefill \\
+    Place & Date & Stamp &  Legally binding signature
+  \end{tabularx}
+
+\vspace{3mm}
+
+\endinput
diff --git a/erklaerung/ptb-declaration.cls b/erklaerung/ptb-declaration.cls
new file mode 100644
index 0000000000000000000000000000000000000000..039aff332d55cd4b7f5d51eb7abe093fffdf438f
--- /dev/null
+++ b/erklaerung/ptb-declaration.cls
@@ -0,0 +1,132 @@
+% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+
+\setcounter{errorcontextlines}{100}  \listfiles
+
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{pt-declaration}
+    [2015/05/27 v0.1a PTB-Klasse (RN)]
+
+\newcommand*\vl@lang{main=ngerman}
+
+\DeclareOption{german}{\def\vl@lang{main=ngerman}}
+\DeclareOption{ngerman}{\def\vl@lang{main=ngerman}}
+\DeclareOption{de}{\def\vl@lang{main=ngerman}}
+\DeclareOption{english}{\def\vl@lang{main=english}}
+\DeclareOption{en}{\def\vl@lang{main=english}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+
+\ProcessOptions\relax
+
+\LoadClass[%
+,paper=a4
+,fontsize=11pt
+,parskip=true
+]{scrartcl}
+
+\RequirePackage[\vl@lang]{babel}
+\RequirePackage{iflang}
+
+
+\RequirePackage[left=25mm,right=25mm,top=2cm,bottom=6cm]{geometry}
+
+\RequirePackage{ifxetex,ifluatex,url,array,tabularx}
+\newif\ifXeOrLua \XeOrLuafalse
+\ifxetex\XeOrLuatrue\else\ifluatex\XeOrLuatrue\fi\fi
+
+% TODO: Mathematik?
+\ifXeOrLua% XeLaTeX oder luaLaTeX
+  \RequirePackage{fontspec}
+  \setmainfont{TeX Gyre Pagella}[Ligatures=TeX]
+  \setsansfont{TeX Gyre Heros}[Scale=MatchUppercase,Ligatures=TeX]
+  \setmonofont{AnonymousPro-Regular}[%
+    Extension = .ttf,
+    BoldFont = AnonymousPro-Bold,
+    ItalicFont = AnonymousPro-Italic,
+    BoldItalicFont = AnonymousPro-BoldItalic,
+    Scale     = MatchLowercase
+  ]
+\else
+  \RequirePackage[utf8]{inputenc}
+  \RequirePackage[T1]{fontenc}
+  \RequirePackage{textcomp}
+  \RequirePackage{mathpazo}
+  \RequirePackage{tgpagella}
+  \RequirePackage{tgheros}
+  \RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
+\fi
+
+\RequirePackage{amsfonts,trimspaces,siunitx}
+
+\newcommand*\vl@setcommand[3][]{%  #1=default (opt.), #2=macro, #3=value
+  \edef\vl@tempa{\trim@spaces@noexp{#3}}%
+  \expandafter\protected@xdef\csname #2\endcsname{%
+    \ifx\@empty\vl@tempa #1\else\vl@tempa\fi}%
+}
+
+\newcommand*\myref[1]{\vl@setcommand{vl@myref}{#1}}
+\newcommand*\mymail[1]{\vl@setcommand{vl@mymail}{#1}}
+\newcommand*\myfax[1]{\vl@setcommand{vl@myfax}{#1}}
+\newcommand*\myemail[1]{\vl@setcommand{vl@myemail}{#1}}
+\newcommand*\vl@myref{}
+\newcommand*\vl@mymail{}
+\newcommand*\vl@myfax{}
+\newcommand*\vl@myemail{}
+
+\newcolumntype{Y}{>{\centering\arraybackslash}X}
+\newcolumntype{C}[1]{>{\centering\arraybackslash}p{#1}}
+
+\AtBeginDocument{%
+  \RequirePackage{paralist}
+  \newcommand*\vl@begin@list[1]{%
+    %\vl@tempdima=\parindent
+    %\vl@tempdimb=\parskip
+    \@nameuse{#1}%
+    %\parindent=\vl@tempdima
+    %\parskip=\vl@tempdimb
+  }
+  \def\enumerate{%
+    \vl@begin@list{compactenum}%
+  }
+  \def\itemize{%
+    \vl@begin@list{compactitem}%
+  }
+  \def\description{%
+    \vl@begin@list{compactdesc}%
+  }
+  \let\enditemize\endcompactitem
+  \let\endenumerate\endcompactenum
+  \let\enddescription\endcompactdesc
+  \pltopsep=\medskipamount
+  \plitemsep=\medskipamount
+  \setlength\leftmargini{1.5em}
+  \setlength\leftmarginii{1.1em}
+  \setlength\leftmarginiii{1.1em}
+  \setlength\leftmarginiv{1.1em}
+  \setlength\labelsep{.5em}
+
+  \ifxetex\else
+    \RequirePackage[%
+    ,factor=1500
+    ,protrusion=true
+    ,expansion=true
+    ,verbose=true
+    ,final=true
+    ,letterspace=100
+    ,babel=true
+    ]{microtype}
+  \fi
+
+  \makeatletter
+  \IfLanguageName{ngerman}{%
+    \input{ptb-declaration-de.clo}
+  }{%
+    \input{ptb-declaration-en.clo}
+  }
+  \makeatother
+}
+
+
+\textheight=1.2\textheight
+\pagestyle{empty}
+
+\endinput
diff --git a/erklaerung/test-declaration-de.tex b/erklaerung/test-declaration-de.tex
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3c890e291e1f3cbf232607d53fb55e1ea741850e 100644
--- a/erklaerung/test-declaration-de.tex
+++ b/erklaerung/test-declaration-de.tex
@@ -0,0 +1,9 @@
+\documentclass[de]{ptb-declaration}
+
+\myref{7.5-1V-15-05}
+\mymail{2015-12-04}
+\myfax{+49-30-3481-7490}
+\myemail{karl.jousten@ptb.de}
+
+\begin{document}
+\end{document}
diff --git a/erklaerung/test-declaration-en.tex b/erklaerung/test-declaration-en.tex
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..da7c12ae98c3d8a8876b9b04bbc7dd741b3dbd7e 100644
--- a/erklaerung/test-declaration-en.tex
+++ b/erklaerung/test-declaration-en.tex
@@ -0,0 +1,9 @@
+\documentclass[en]{ptb-declaration}
+
+\myref{7.5-1V-15-05}
+\mymail{2015-12-04}
+\myfax{+49-30-3481-7490}
+\myemail{karl.jousten@ptb.de}
+
+\begin{document}
+\end{document}
diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls
index 9536bed8472ea6771703446e0b32afc77cbec3ed..16dcabce16a9bc2b3447a45e05073cb6d258be56 100644
--- a/ptbletter/ptbletter.cls
+++ b/ptbletter/ptbletter.cls
@@ -151,7 +151,7 @@
 
 \setkomavar{location}{%
   \extrarowheight=-1bp %
-  \begin{tabular}{@{}>{\strut\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}}
+  \begin{tabular}{@{}>{\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}}
     \usekomavar*{yourref} & \usekomavar{yourref}\\
     \usekomavar*{yourmail} & \usekomavar{yourmail}\\
     \usekomavar*{myref} & \usekomavar{myref}\\