diff --git a/ChangeLog b/ChangeLog
index e3af536..9b7a66b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-28 Fred Kiefer <FredKiefer@gmx.de>
+	
+	* Source/cairo/CairoContext.m (-initWithContextInfo:): Set self
+	from super call to get PS contexts working.
+
 2007-02-28  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* configure.ac: Use gnustep-config to set GNUSTEP_MAKEFILES
diff --git a/Source/cairo/CairoContext.m b/Source/cairo/CairoContext.m
index 0a9cbd1..d910252 100644
--- a/Source/cairo/CairoContext.m
+++ b/Source/cairo/CairoContext.m
@@ -59,10 +59,9 @@
 {
   NSString *contextType;
 
-  [super initWithContextInfo:info];
-
   contextType = [info objectForKey:
 			 NSGraphicsContextRepresentationFormatAttributeName];
+  self = [super initWithContextInfo: info];
   if (contextType)
     {
       /* Most likely this is a PS or PDF context, so just return what