diff --git a/teckids.sty b/teckids.sty
index 103964aae0183512de05f36137651a100b428748..4321f4a9b7d6df09c1447aebc970901265726ebb 100644
--- a/teckids.sty
+++ b/teckids.sty
@@ -43,11 +43,6 @@
 \RequirePackage{pxfonts}
 \renewcommand{\familydefault}{\sfdefault}
 
-% Hurenkinder und Schusterjungen verhindern
-\clubpenalty10000
-\widowpenalty10000
-\displaywidowpenalty=10000
-
 \newcommand\0{\scalebox{-1}[1]{0}}
 
 \DeclareGraphicsExtensions{.pdf,.eps,.png,.jpg}
diff --git a/teckidspubmat.cls b/teckidspubmat.cls
index 194287a548d0fadeaca872339335debc1c6aa891..cbf93d98b0be1937bb8094b55966056f3989617c 100644
--- a/teckidspubmat.cls
+++ b/teckidspubmat.cls
@@ -28,35 +28,23 @@
 
 \RequirePackage{teckids}
 
-\usepackage{fancyhdr}
-\geometry{footskip=0.6cm}
-\usepackage{calc}
-\newlength{\myheight}
-\pagestyle{fancy}
-\fancyhf{}
-\renewcommand{\headrulewidth}{0.6pt}
-\renewcommand{\footrulewidth}{0.6pt}
-\fancyhead[L]{\headmark}
-\fancyhead[R]{\today}
-\fancyfoot[L]{
-	\settoheight{\myheight}{\thepage}
-	\raisebox{\myheight-\height}{
-		\includegraphics[width=3cm]{cc-by-sa}
-	}
-}
-\fancyfoot[R]{
-	\settoheight{\myheight}{\thepage}
-	\raisebox{\myheight-\height}{
-		\teckidslogo[3cm]{}
-	}
-}
+\RequirePackage[automark]{scrpage2}
+\pagestyle{scrheadings}
+\clearscrheadings
+\clearscrplain
+\lohead{\headmark}
+\rohead{\today}
+\lofoot{\rule{\textwidth}{1pt}
+\includegraphics[width=3cm]{cc-by-sa}}
+\rofoot{\teckidslogo[3cm]{}}
 
 \newcommand{\teckidspubmat}[2]{
 \hypersetup{
 	pdfauthor = {#2, and others; see gitweb of Teckids e.V.}
 }
-\fancyhead[L]{\Large #1}
-\fancyfoot[C]{\footnotesize
+\lohead{\Large #1}
+\cofoot{\footnotesize
+\linebreak% wegen \rule im \lofoot
 \copyright 2014 #2\linebreak
 Lizenziert unter einer Creative Commons Namensnennung - \linebreak
 Weitergabe unter gleichen Bedingungen 3.0 Deutschland Lizenz.}