diff --git a/ChangeLog b/ChangeLog
index 5c42c3d20..ed559607a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-14 09:17-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Headers/AppKit/NSSegmentedControl.h
+	* Source/NSSegmentedCell.m
+	* Source/NSSegmentedControl.m: Correct tabbing.
+
 2008-01-14 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSKeyValueBinding.m (+getBinding:forObject:): Correct bug
diff --git a/Headers/AppKit/NSSegmentedControl.h b/Headers/AppKit/NSSegmentedControl.h
index 0cf681b7f..d544662a1 100644
--- a/Headers/AppKit/NSSegmentedControl.h
+++ b/Headers/AppKit/NSSegmentedControl.h
@@ -53,5 +53,6 @@
 - (BOOL) isSelectedForSegment: (int)segment;
 - (void) setEnabled: (BOOL)flag forSegment: (int)segment;
 - (BOOL) isEnabledForSegment: (int)segment;
+
 @end
 #endif
diff --git a/Source/NSSegmentedCell.m b/Source/NSSegmentedCell.m
index 5d04aa96e..485a18990 100644
--- a/Source/NSSegmentedCell.m
+++ b/Source/NSSegmentedCell.m
@@ -348,13 +348,13 @@
     {
       [segment setSelected: flag];
       if (flag)
-	{
-	  _selected_segment = seg;
-	}
+        {
+          _selected_segment = seg;
+        }
       else if (seg == _selected_segment)
-	{
-	  _selected_segment = -1;
-	}
+        {
+          _selected_segment = -1;
+        }
     }
 }
 
@@ -524,7 +524,7 @@
 {
   id segment = [_items objectAtIndex: seg];
   NSFont *font = [NSFont controlContentFontOfSize: 
-			   [NSFont systemFontSize]];
+                           [NSFont systemFontSize]];
   NSString *label = [segment label];
   NSSize textSize = [label sizeWithAttributes: [NSDictionary dictionary]];
   NSRect textFrame = frame;
diff --git a/Source/NSSegmentedControl.m b/Source/NSSegmentedControl.m
index 12f4251ad..5a49c896c 100644
--- a/Source/NSSegmentedControl.m
+++ b/Source/NSSegmentedControl.m
@@ -121,7 +121,7 @@
 - (void) mouseDown: (NSEvent *)event
 {
   NSPoint location = [self convertPoint: [event locationInWindow] 
-			   fromView: nil];
+                           fromView: nil];
 
   [super mouseDown: event];
   [_cell _detectHit: location];