diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls
index 488d0cb0d07a35895eebb7f88b2fb92481eb677f..1c5caeb85b016206c1f1907c21e46da547114ba2 100644
--- a/ptbposter/ptbposter.cls
+++ b/ptbposter/ptbposter.cls
@@ -4,7 +4,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{ptbposter}
-    [2015/05/08 v0.3d PTB-Poster-Klasse (RN)]
+    [2015/05/11 v0.3e PTB-Poster-Klasse (RN)]
 
 \newdimen\PTB@topmargin      % Abstand zum Rahmen
 \newdimen\PTB@leftmargin     % Abstand zum Rahmen
@@ -457,17 +457,29 @@
   \setlength\labelsep{.5em}
 }
 
+\KOMAoptions{captions=oneline}
 
 \renewenvironment{figure}[1][]{%
-  \renewcommand*\caption[2][]{\captionof{figure}{##2}}%
-}{}
+  \def\@captype{figure}%
+  \trivlist\item\relax
+}{\endtrivlist}
+\renewenvironment{figure*}[1][]{%
+  \def\@captype{figure}%
+  \trivlist\item\relax
+}{\endtrivlist}
 \renewenvironment{table}[1][]{%
-  \renewcommand*\caption[2][]{\captionof{table}{##2}}%
-}{}
+  \def\@captype{table}%
+  \trivlist\item\relax
+}{\endtrivlist}
+\renewenvironment{table*}[1][]{%
+  \def\@captype{table}%
+  \trivlist\item\relax
+}{\endtrivlist}
+
 \addtokomafont{caption}{\small}
-\addtokomafont{captionlabel}{\bfseries}
+\addtokomafont{captionlabel}{\sffamily\bfseries}
 \setcapindent{1em}
-\setcapwidth[l]{\textwidth}
+%\setcapwidth[l]{\linewidth}
 
 \setcounter{secnumdepth}{-2}
 \renewcommand*\maketitle[1][1]{}