diff --git a/ChangeLog b/ChangeLog
index 0b678724..c051a844 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-30 23:40-EST Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Plugins/Nib/GormNibWrapperLoader.m: Remove reference to 
+	GSClassSwapper and replace it with NSClassSwapper.
+	* Plugins/Nib/GormWindowTemplate.m: Override the
+	baseWindowClass method to return GormNSWindow as appropriate.
+
 2009-12-27 01:17-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Gorm.m
diff --git a/Plugins/Nib/GormNibWrapperLoader.m b/Plugins/Nib/GormNibWrapperLoader.m
index 0040d74a..c577711d 100644
--- a/Plugins/Nib/GormNibWrapperLoader.m
+++ b/Plugins/Nib/GormNibWrapperLoader.m
@@ -35,6 +35,8 @@
 #include "GormNibWrapperLoader.h"
 #include "GormWindowTemplate.h"
 
+@class GormNSWindow;
+
 @implementation GormNibWrapperLoader
 + (NSString *) fileType
 {
@@ -126,6 +128,7 @@
 	       * handling class replacement so that standard objects understood
 	       * by the gui library are converted to their Gorm internal equivalents.
 	       */
+
 	      u = [[NSKeyedUnarchiver alloc] initForReadingWithData: data];
 	      [u setDelegate: self];
 	      
@@ -138,6 +141,8 @@
 		 forClassName: @"NSCustomView"];
 	      [u setClass: [GormWindowTemplate class] 
 		 forClassName: @"NSWindowTemplate"];
+	      [u setClass: [GormNSWindow class] 
+		 forClassName: @"NSWindow"];
 	      
 	      /*
 	       * Substitute any classes specified by the palettes...
@@ -316,6 +321,7 @@
 		  result = YES;
 		}
 	    }
+	  [NSClassSwapper setIsInInterfaceBuilder: NO];      
 	}
     }
   NS_HANDLER
diff --git a/Plugins/Nib/GormWindowTemplate.m b/Plugins/Nib/GormWindowTemplate.m
index 62a7fb89..69f7783d 100644
--- a/Plugins/Nib/GormWindowTemplate.m
+++ b/Plugins/Nib/GormWindowTemplate.m
@@ -24,6 +24,8 @@
 
 #include "GormWindowTemplate.h"
 
+@class GormNSWindow;
+
 @interface NSWindow (Private)
 - (void) _setReleasedWhenClosed: (BOOL)flags;
 @end
@@ -46,5 +48,10 @@
 
   return object;
 }
+
+- (Class) baseWindowClass
+{
+  return [GormNSWindow class];
+}
 @end