diff --git a/ChangeLog b/ChangeLog
index 5b8edc0..8310a7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
     * DBModeler/Inspectors/AttributeInspector.*
     * DBModeler/Inspectors/GNUmakefile
     Moved to Renaissance for the Attribute Inspector
+    * EOModeler/EOMInspector.m: load markup, not gorm
 
 2010-04-29  David Wetzel  <dave@turbocat.de>
     * EOControl/EOMutableKnownKeyDictionary.m
diff --git a/EOModeler/EOMInspector.m b/EOModeler/EOMInspector.m
index 4c53421..901d71c 100644
--- a/EOModeler/EOMInspector.m
+++ b/EOModeler/EOMInspector.m
@@ -161,9 +161,17 @@ static NSMapTable *_inspectorsByClass;
 
 - (void) load
 {
-  if (![NSBundle loadNibNamed:NSStringFromClass([self class])
-	    owner: self])
-      NSLog(@"failed to load: %@.gorm", NSStringFromClass([self class]));
+  
+  if (![NSBundle loadGSMarkupNamed:NSStringFromClass([self class]) 
+                             owner:self])
+  {
+    NSLog(@"failed to load: %@.gsmarkup", NSStringFromClass([self class]));
+  }
+  
+  
+  //  if (![NSBundle loadNibNamed:NSStringFromClass([self class])
+  //	    owner: self])
+  //      NSLog(@"failed to load: %@.gorm", NSStringFromClass([self class]));
 }
 
 - (void) unload