diff --git a/kalibrierschein.cls b/kalibrierschein.cls
index 7c571fc83806d356573fe39eb632713f11d2c4ab..fd314939c97929637e2f2ce898083f25307ef371 100644
--- a/kalibrierschein.cls
+++ b/kalibrierschein.cls
@@ -9,7 +9,7 @@
 \newif\ifnoCMC \noCMCfalse
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{kalibrierschein}
-  [2021/03/12 v0.6b documentclass PTB `Kalibrierschein' (RN/PTB)]
+  [2021/06/03 v0.6c documentclass PTB `Kalibrierschein' (RN/PTB)]
 \DeclareOption{BS}{\def\ks@location{Braunschweig}}
 \DeclareOption{BLN}{\def\ks@location{Berlin}}
 \DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
@@ -67,7 +67,7 @@ footskip=0bp,
   \newcommand*\ks@draftName{Draft}%
   \useshorthands{"}
   \defineshorthand{"`}{\openautoquote}
-  \defineshorthand{"'}{\closeautoquote}  
+  \defineshorthand{"'}{\closeautoquote}
 }
 \AtEndOfClass{\shorthandon{"}}
 \MakeAutoQuote{»}{«}
@@ -129,7 +129,7 @@ footskip=0bp,
     \else% TeX+dvips
     \fi
   \fi
-\fi 
+\fi
 
 \RequirePackage{amsmath}
 
@@ -154,12 +154,12 @@ footskip=0bp,
 
 \RequirePackage{picture}% noch nötig?
 
-\newdimen\ks@tempdima 
-\newdimen\ks@tempdimb 
-\newdimen\ks@tempdimc 
-\newdimen\ks@tempdimd 
-\newdimen\ks@tempdime 
-\newdimen\ks@tempdimf 
+\newdimen\ks@tempdima
+\newdimen\ks@tempdimb
+\newdimen\ks@tempdimc
+\newdimen\ks@tempdimd
+\newdimen\ks@tempdime
+\newdimen\ks@tempdimf
 
 \newcommand*\ks@tempa{}
 \newcommand*\ks@tempb{}
@@ -175,7 +175,7 @@ footskip=0bp,
 }
 
 \newcommand*\ks@addTabLine[1]{%
-  \def\@tempc{}%  
+  \def\@tempc{}%
   \@for\@tempa:=#1\do{%
     \begingroup
       \let\\=\relax\let\newline=\relax
@@ -203,7 +203,7 @@ footskip=0bp,
   \ks@getColSpec{\ks@type}{\ks@colSpec}%
   \edef\@tempa{\noexpand\begin{tabular}[t]{@{}\ks@colSpec @{}}}%
   \ks@tab\expandafter{\@tempa}%
-  \ks@addTabLine{\ks@manufacturer}%  
+  \ks@addTabLine{\ks@manufacturer}%
   \ks@add{\tabularnewline[#1]}%
   \ks@addTabLine{\ks@type}%
   \ks@add{\tabularnewline[#2]}%
@@ -328,7 +328,7 @@ footskip=0bp,
     \extrarowheight=.2ex %
     %\tabcolsep=0pt %
     \sisetup{%
-      retain-zero-exponent
+      print-zero-exponent = false% default
     }%
     \par\mbox{}\vskip-\baselineskip\the\ks@tab
   \endgroup
@@ -345,7 +345,7 @@ footskip=0bp,
         \expandafter\trim@spaces\expandafter{\ks@tempb}}%
       \ifx\ks@tempb\@empty\else
         \expandafter\ks@add\expandafter{\ks@tempb\tabularnewline}%
-      \fi  
+      \fi
     }%
     \let\\=\ks@tempa
     \extrarowheight=-.1ex %
@@ -375,7 +375,7 @@ footskip=0bp,
                 \color{lightgray}Fehler:~\ks@missingEntries}}}}}}%
         }%
       }%
-    \fi  
+    \fi
   }
 }
 
@@ -403,7 +403,7 @@ footskip=0bp,
 \newcommand\Section[2]{%
   \section{#1\newline\itshape\small#2}%
 }
-\newenvironment{english}[1][.8]{% 
+\newenvironment{english}[1][.8]{%
   \otherlanguage{english}%
   \useshorthands{"}
   \defineshorthand{"`}{\openautoquote}%
diff --git a/siunitx-PTB.sty b/siunitx-PTB.sty
index 782ae8cee0bcb6997db603616fdc73e7339eb3bf..a1ea6ba36e054e1f1e37bea4ee361d00b38c6a16 100644
--- a/siunitx-PTB.sty
+++ b/siunitx-PTB.sty
@@ -1,6 +1,6 @@
 % Rolf Niepraschk, PTB, Rolf.Niepraschk@ptb.de
 
-\ProvidesPackage{siunitx-PTB}[2021/05/31 v0.1h Additions to `siunitx'' (PTB/RN)]
+\ProvidesPackage{siunitx-PTB}[2021/06/03 v0.1i Additions to `siunitx'' (PTB/RN)]
 
 \RequirePackage{amsmath,siunitx}
 
@@ -36,23 +36,24 @@
   %%%,input-uncertainty-signs = +-
   %%%,output-open-uncertainty =
   %%%,output-close-uncertainty =
-  %%,separate-uncertainty = true
-  ,bracket-numbers = true
+  ,bracket-ambiguous-numbers = true
   %,per-mode = symbol
-  ,per-mode = reciprocal
+  ,per-mode = power
   %,per-mode=symbol-or-fraction
   ,mode = text % !!!
   ,tight-spacing = false
-  ,separate-uncertainty
+  ,uncertainty-mode = separate
   %%%,inter-unit-product = \ensuremath{{}\cdot{}}
-  % weil default ( {}^{\circ} ) manchmal problematisch ("firamath"!?) 
-  ,text-degree = \textdegree
-  ,math-degree = \textdegree  
-  ,math-celsius = \textdegree\text{C}
-  ,text-celsius = \textdegree\text{C}
-  ,detect-weight=true, detect-family=true
-  ,list-units=brackets
-}%     
+  % weil default ( {}^{\circ} ) manchmal problematisch ("firamath"!?)
+%%%  ,text-degree = \textdegree
+%%%  ,math-degree = \textdegree
+%%%  ,math-celsius = \textdegree\text{C}
+%%%  ,text-celsius = \textdegree\text{C}
+  ,reset-text-series = false, text-series-to-math = true% vormals: detect-weight=true
+  ,reset-text-family = false, text-family-to-math = true% vormals: detect-family=true
+  ,list-units = bracket
+  %,print-zero-exponent = false
+}%
 
 %%%}
 \AtBeginDocument{
@@ -100,8 +101,8 @@
   }
 }
 
-\addto\extrasgerman{\setupGerman} 
-\addto\extrasngerman{\setupGerman} 
+\addto\extrasgerman{\setupGerman}
+\addto\extrasngerman{\setupGerman}
 \addto\extrasenglish{\sisetup{locale=US}}
 
 \endinput