diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls
index ea40c4b3f11a7bb9237b26bdbd5319795ba667a2..488d0cb0d07a35895eebb7f88b2fb92481eb677f 100644
--- a/ptbposter/ptbposter.cls
+++ b/ptbposter/ptbposter.cls
@@ -457,11 +457,13 @@
   \setlength\labelsep{.5em}
 }
 
-% TODO: Dasselbe auch für "table"
+
 \renewenvironment{figure}[1][]{%
-  %\def\@captype{figure}% ???
   \renewcommand*\caption[2][]{\captionof{figure}{##2}}%
 }{}
+\renewenvironment{table}[1][]{%
+  \renewcommand*\caption[2][]{\captionof{table}{##2}}%
+}{}
 \addtokomafont{caption}{\small}
 \addtokomafont{captionlabel}{\bfseries}
 \setcapindent{1em}