diff --git a/ChangeLog b/ChangeLog
index 2dd2c7aa4..9cb7ca585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-10 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
+
+	* Source/NSTabView.m
+	* Headers/AppKit/NSTabView.h
+	  some int/NSInteger to NSUInteger changes to better
+	  match return values of methods
+
 2012-04-06 12:26  theraven
 
 	* libs/gui/trunk/Headers/AppKit/NSColorWell.h,
diff --git a/Headers/AppKit/NSTabView.h b/Headers/AppKit/NSTabView.h
index 02e05b58b..17b3fb7c8 100644
--- a/Headers/AppKit/NSTabView.h
+++ b/Headers/AppKit/NSTabView.h
@@ -54,7 +54,7 @@ typedef enum {
   BOOL _draws_background;
   BOOL _truncated_label;
   id _delegate;
-  NSInteger _selected_item;
+  NSUInteger _selected_item;
 }
 - (void)addTabViewItem:(NSTabViewItem *)tabViewItem;
 - (void)insertTabViewItem:(NSTabViewItem *)tabViewItem
diff --git a/Source/NSTabView.m b/Source/NSTabView.m
index ad3001548..c835425e2 100644
--- a/Source/NSTabView.m
+++ b/Source/NSTabView.m
@@ -123,7 +123,7 @@
 
 - (void) removeTabViewItem: (NSTabViewItem*)tabViewItem
 {
-  unsigned i = [_items indexOfObject: tabViewItem];
+  NSUInteger i = [_items indexOfObject: tabViewItem];
   
   if (i == NSNotFound)
     return;
@@ -202,7 +202,7 @@
 
 - (void) selectNextTabViewItem: (id)sender
 {
-  if ((_selected_item != NSNotFound) && ((unsigned)(_selected_item + 1) < [_items count]))
+  if ((_selected_item != NSNotFound) && ((_selected_item + 1) < [_items count]))
     {
       [self selectTabViewItemAtIndex: _selected_item + 1];
     }
@@ -550,7 +550,7 @@
       [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_draws_background];
       [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_truncated_label];
       [aCoder encodeConditionalObject: _delegate];
-      [aCoder encodeValueOfObjCType: "i" at: &_selected_item];
+      [aCoder encodeValueOfObjCType: "I" at: &_selected_item];
     }
 }
 
@@ -631,7 +631,7 @@
       [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_draws_background];
       [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_truncated_label];
       _delegate = [aDecoder decodeObject];
-      [aDecoder decodeValueOfObjCType: "i" at: &_selected_item];
+      [aDecoder decodeValueOfObjCType: "I" at: &_selected_item];
       _selected = [_items objectAtIndex: _selected_item];
     }
   return self;