diff --git a/AUTHORS b/AUTHORS
index d6488ec..bb94cef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,3 +3,4 @@ Gerald Siebke <gerald@turbocat.de>
 Manuel Guesdon <mguesdon@orange-concept.com>
 David Ayers <ayers@fsfe.org>
 Matt Rice <ratmice@gmail.com>
+David Wetzel <dave@turbocat.de>
diff --git a/ChangeLog b/ChangeLog
index 0a255b9..bd89d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-17  David Wetzel <dave@turbocat.de>
+        * EOCustomObject.h/m new class like in EOF3. Use this as your EO's superclass or
+          use EOGenericRecords
+
 2010-04-14  David Ayers  <ayers@fsfe.org>
 
 	* EOMutableKnownKeyDictionary.h/m ([-initWithObjects:forKeys:count:]):
diff --git a/EOControl/EOCustomObject.h b/EOControl/EOCustomObject.h
new file mode 100644
index 0000000..19651b9
--- /dev/null
+++ b/EOControl/EOCustomObject.h
@@ -0,0 +1,45 @@
+/* -*-objc-*-
+ EOGenericRecord.h
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ 
+ Author: David Wetzel <dave@turbocat.de>
+ Date: April 2010
+ 
+ This file is part of the GNUstep Database Library.
+ 
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+ 
+ You should have received a copy of the GNU Library General Public
+ License along with this library; see the file COPYING.LIB.
+ If not, write to the Free Software Foundation,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __EOCustomObject_h__
+#define __EOCustomObject_h__
+
+#ifdef GNUSTEP
+#include <Foundation/NSObject.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+
+@interface EOCustomObject : NSObject
+{
+
+}
+
+@end
+
+#endif // __EOCustomObject_h__
+
diff --git a/EOControl/EOCustomObject.m b/EOControl/EOCustomObject.m
new file mode 100644
index 0000000..5253afc
--- /dev/null
+++ b/EOControl/EOCustomObject.m
@@ -0,0 +1,52 @@
+/** 
+ EOCustomObject.m <title>EOCustomObject</title>
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ 
+ Author: David Wetzel <dave@turbocat.de>
+ Date: April 2010
+ 
+ <abstract></abstract>
+ 
+ This file is part of the GNUstep Database Library.
+ 
+ <license>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+ 
+ You should have received a copy of the GNU Library General Public
+ License along with this library; see the file COPYING.LIB.
+ If not, write to the Free Software Foundation,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ </license>
+ **/
+
+#include "config.h"
+
+RCS_ID("$Id: EOGenericRecord.m 30111 2010-04-09 10:09:41Z ayers $")
+
+#ifdef GNUSTEP
+#include <Foundation/NSArray.h>
+#include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSObjCRuntime.h>
+#include <Foundation/NSValue.h>
+#include <Foundation/NSHashTable.h>
+#include <Foundation/NSDebug.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#include "EOCustomObject.h"
+
+
+@implementation EOCustomObject
+
+@end
diff --git a/EOControl/EOGenericRecord.h b/EOControl/EOGenericRecord.h
index 93a2751..bba7920 100644
--- a/EOControl/EOGenericRecord.h
+++ b/EOControl/EOGenericRecord.h
@@ -33,6 +33,8 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#include <EOControl/EOCustomObject.h>
+
 
 @class NSString;
 @class NSMutableDictionary;
@@ -43,7 +45,7 @@
 @class EOMutableKnownKeyDictionary;
 
 
-@interface EOGenericRecord : NSObject
+@interface EOGenericRecord : EOCustomObject
 {
   EOClassDescription *classDescription;
   EOMutableKnownKeyDictionary *dictionary;
diff --git a/EOControl/GNUmakefile b/EOControl/GNUmakefile
index 9ad69da..6d7f3cc 100644
--- a/EOControl/GNUmakefile
+++ b/EOControl/GNUmakefile
@@ -1,7 +1,7 @@
 #
 #  EOControl makefile for GNUstep Database Library.
 #  
-#  Copyright (C) 1997,2002,2003,2004,2005 Free Software Foundation, Inc.
+#  Copyright (C) 1997,2002,2003,2004,2005,2010 Free Software Foundation, Inc.
 #
 #  Written by:	Scott Christley <scottc@net-community.com>
 #
@@ -39,6 +39,7 @@ EOControl_C_FILES =
 EOControl_OBJC_FILES = \
 EOSortOrdering.m \
 EOFetchSpecification.m \
+EOCustomObject.m \
 EOGenericRecord.m \
 EOClassDescription.m \
 EOKeyValueCoding.m \
@@ -79,6 +80,7 @@ EOControl_HEADER_FILES_INSTALL_DIR = /EOControl
 EOControl_HEADER_FILES = \
 EOSortOrdering.h \
 EOFetchSpecification.h \
+EOCustomObject.h \
 EOGenericRecord.h \
 EOClassDescription.h \
 EOKeyValueCoding.h \