diff --git a/HsH-classes.dtx b/HsH-classes.dtx
index 671e6a8f0c226c805a2d50bc6eca94066a11e873..a06d5b807abee12bff16d00ec52036743c130d20 100644
--- a/HsH-classes.dtx
+++ b/HsH-classes.dtx
@@ -74,6 +74,8 @@
   \@todostrue
 }
 %</article|report>
+%
+%% defere all other options to the base class
 %<article>\DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{scrartcl}}
 %<report>\DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{scrreprt}}
 %<standalone>\DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{standalone}}
@@ -341,24 +343,22 @@
   \makeatother
 }
 %
-%<*article|report>
+%<*report>
 %% nicer abstract ---------------------------------------------------------------------------------
 \renewenvironment{abstract}{
   \quotation
   \setlength\parindent{0pt}
-%<article>  \section*{\abstractname}
-%<article>  \addcontentsline{toc}{section}{\abstractname}
-%<report>  \chapter*{\abstractname}
-%<report>  \addcontentsline{toc}{chapter}{\abstractname}
+  \addchap{\abstractname}
 }{%
   \ifx\@keywords\@empty\else
-%<article>    \vskip 0.5em
-%<report>    \vskip 2em
+    \vskip 2em
     \paragraph{\if@german Schlüsselwörter:\else Keywords:\fi}
     \@keywords
   \fi
   \endquotation
 }
+%</report>
+%<*article|report>
 %% decloration of Authorship ----------------------------------------------------------------------
 \newif\if@oneAuthor \@oneAuthortrue
 \if@german
diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index 29300a35012942ce155af6141f64f926ab572a1a..7e7513e8df6f987d39028ac5b0b6f83f251cd69d 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -73,6 +73,7 @@
 \DeclareOption{todos}{
   \@todostrue
 }
+%% defere all other options to the base class
 \DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{scrartcl}}
 \ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options
 \ProcessOptions\relax
@@ -240,20 +241,6 @@
   \providecommand{\abs}[1]{\ensuremath{\left\vert#1\right\vert}}
   \makeatother
 }
-%% nicer abstract ---------------------------------------------------------------------------------
-\renewenvironment{abstract}{
-  \quotation
-  \setlength\parindent{0pt}
-  \section*{\abstractname}
-  \addcontentsline{toc}{section}{\abstractname}
-}{%
-  \ifx\@keywords\@empty\else
-    \vskip 0.5em
-    \paragraph{\if@german Schlüsselwörter:\else Keywords:\fi}
-    \@keywords
-  \fi
-  \endquotation
-}
 %% decloration of Authorship ----------------------------------------------------------------------
 \newif\if@oneAuthor \@oneAuthortrue
 \if@german
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 53f8fe3e8e16c910593cf19e71d8141e00f0f4ab..b2c75deb847afc5e6b7d1e4d470dcfaf100d4ab2 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -73,6 +73,7 @@
 \DeclareOption{todos}{
   \@todostrue
 }
+%% defere all other options to the base class
 \DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{scrreprt}}
 \ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options
 \ProcessOptions\relax
@@ -260,8 +261,7 @@
 \renewenvironment{abstract}{
   \quotation
   \setlength\parindent{0pt}
-  \chapter*{\abstractname}
-  \addcontentsline{toc}{chapter}{\abstractname}
+  \addchap{\abstractname}
 }{%
   \ifx\@keywords\@empty\else
     \vskip 2em
diff --git a/src/HsH-standalone.cls b/src/HsH-standalone.cls
index 0c7464dfeb480dcbcaf5fe0300de0c6307f4de87..b27db0e3e87846fd681efa49ab40a5026b5adb5c 100644
--- a/src/HsH-standalone.cls
+++ b/src/HsH-standalone.cls
@@ -69,6 +69,7 @@
 \DeclareOption{roman}{
   \renewcommand{\familydefault}{\rmdefault}
 }
+%% defere all other options to the base class
 \DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{standalone}}
 \ExecuteOptions{margin=0.25cm,fontsize=11pt,a4paper,ngerman,sans} % default options
 \ProcessOptions\relax