diff --git a/Tools/nib2cib/NSButton.j b/Tools/nib2cib/NSButton.j
index f5597344c..59437de96 100644
--- a/Tools/nib2cib/NSButton.j
+++ b/Tools/nib2cib/NSButton.j
@@ -269,6 +269,8 @@ var NSButtonIsBorderedMask = 0x00800000,
     _highlightsBy = [cell highlightsBy];
     _showsStateBy = [cell showsStateBy];
 
+    [self setTag:[cell tag]];
+
     return self;
 }
 
diff --git a/Tools/nib2cib/NSCell.j b/Tools/nib2cib/NSCell.j
index ae8b2709f..23ba1264f 100644
--- a/Tools/nib2cib/NSCell.j
+++ b/Tools/nib2cib/NSCell.j
@@ -49,6 +49,7 @@
     CPFont          _font                       @accessors(readonly, getter=font);
     int             _lineBreakMode              @accessors(readonly, getter=lineBreakMode);
     CPFormatter     _formatter                  @accessors(readonly, getter=formatter);
+    int             _tag                        @accessors(readonly, getter=tag);
 }
 
 - (id)initWithCoder:(CPCoder)aCoder
@@ -81,6 +82,8 @@
         _font           = [aCoder decodeObjectForKey:@"NSSupport"];
 
         _formatter      = [aCoder decodeObjectForKey:@"NSFormatter"];
+
+        _tag            = [aCoder decodeIntForKey:@"NSTag"];
     }
 
     return self;
diff --git a/Tools/nib2cib/NSMatrix.j b/Tools/nib2cib/NSMatrix.j
index a71e3ef98..4f061a52e 100644
--- a/Tools/nib2cib/NSMatrix.j
+++ b/Tools/nib2cib/NSMatrix.j
@@ -115,6 +115,7 @@ var NSMatrixRadioModeMask = 0x40000000,
         [self setAllowsMixedState:[aCell allowsMixedState]];
         [self setObjectValue:[aCell objectValue]];
         [self setEnabled:[aCell isEnabled]];
+        [self setTag:[aCell tag]];
     }
 
     return self;