diff --git a/ChangeLog b/ChangeLog
index fe5b40630..a9a6da454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2003-08-31  Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSToolbarItem.m: Corrected code to instantiate
+	button for toolbar items.
+
 2003-08-30  Gregory John Casamento <greg_casamento@yahoo.com>
 
-	* GSNibTemplates.m: [GSNibContainer awakeWithContext:]
+	* Source/GSNibTemplates.m: [GSNibContainer awakeWithContext:]
 	was not releasing the connections in the array after calling
 	establishConnection.   Once this is done, the connections
 	are no longer needed.
@@ -16,7 +21,7 @@
 	
 2003-08-30  Gregory John Casamento <greg_casamento@yahoo.com>
 
-	* GSNibTemplates.m: Added code to templates to conditionally
+	* Source/GSNibTemplates.m: Added code to templates to conditionally
 	call the designated initializer if and only if it is defined
 	on the class which is being unarchived, not the parent classes.
 	This is consistent with behaviour under OpenStep.
@@ -39,7 +44,7 @@
 	
 2003-08-28  Gregory John Casamento <greg_casamento@yahoo.com>
 
-	* GSNibTemplates.m: Removed an extra release which was causing
+	* Source/GSNibTemplates.m: Removed an extra release which was causing
 	a segfault.  Added code to prevent calling the designated initializer
 	when isInterfaceBuilder is defined.
 
diff --git a/Source/NSToolbarItem.m b/Source/NSToolbarItem.m
index 225cbb402..7c074e1a2 100644
--- a/Source/NSToolbarItem.m
+++ b/Source/NSToolbarItem.m
@@ -268,7 +268,7 @@
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
   NSImage *image = [NSImage imageNamed: @"GSToolbarSeperatorItem"];
-  NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
+  NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -286,7 +286,7 @@
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
   NSImage *image = [NSImage imageNamed: @"GSToolbarSpaceItem"];
-  NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
+  NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -304,7 +304,7 @@
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
   NSImage *image = [NSImage imageNamed: @"GSToolbarFlexibleSpaceItem"];
-  NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
+  NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -322,7 +322,7 @@
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
   NSImage *image = [NSImage imageNamed: @"GSToolbarShowColorsItem"];
-  NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
+  NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -340,7 +340,7 @@
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
   NSImage *image = [NSImage imageNamed: @"GSToolbarShowFontsItem"];
-  NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
+  NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -358,7 +358,7 @@
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
   NSImage *image = [NSImage imageNamed: @"GSToolbarCustomizeToolbarItem"];
-  NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
+  NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -376,7 +376,9 @@
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
   NSImage *image = [NSImage imageNamed: @"GSToolbarPrintItem"];
+  NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
   [super initWithItemIdentifier: itemIdentifier];
+  [self setView: button];
   [self setImage: image];
   return self;
 }