diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index ad81ba7d3..971996d0b 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -27,47 +27,22 @@
 #include "CoreGraphics/CGGeometry.h"
 #include "Platform/Platform.h"
 
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPLeftTextAlignment         = 0;
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPRightTextAlignment        = 1;
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPCenterTextAlignment       = 2;
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPJustifiedTextAlignment    = 3;
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPNaturalTextAlignment      = 4;
+CPLeftTextAlignment             = 0;
+CPRightTextAlignment            = 1;
+CPCenterTextAlignment           = 2;
+CPJustifiedTextAlignment        = 3;
+CPNaturalTextAlignment          = 4;
 
-/*
-    @global
-    @group CPControlSize
-*/
-CPRegularControlSize        = 0;
-/*
-    @global
-    @group CPControlSize
-*/
-CPSmallControlSize          = 1;
-/*
-    @global
-    @group CPControlSize
-*/
-CPMiniControlSize           = 2;
+CPRegularControlSize            = 0;
+CPSmallControlSize              = 1;
+CPMiniControlSize               = 2;
+
+CPLineBreakByWordWrapping       = 0;
+CPLineBreakByCharWrapping       = 1;
+CPLineBreakByClipping           = 2;
+CPLineBreakByTruncatingHead     = 3;
+CPLineBreakByTruncatingTail     = 4;
+CPLineBreakByTruncatingMiddle   = 5;
 
 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index c906e80ca..9373f039e 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -29,14 +29,6 @@
 #include "Platform/Platform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"
 
-
-CPLineBreakByWordWrapping       = 0;
-CPLineBreakByCharWrapping       = 1;
-CPLineBreakByClipping           = 2;
-CPLineBreakByTruncatingHead     = 3;
-CPLineBreakByTruncatingTail     = 4;
-CPLineBreakByTruncatingMiddle   = 5;
-
 CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with a squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */
 
diff --git a/Tools/nib2cib/NSCell.j b/Tools/nib2cib/NSCell.j
index 604afeadf..f34f754af 100644
--- a/Tools/nib2cib/NSCell.j
+++ b/Tools/nib2cib/NSCell.j
@@ -44,6 +44,7 @@
     CPControlSize   _controlSize    @accessors(readonly, getter=controlSize);
     id              _objectValue    @accessors(readonly, getter=objectValue);
     CPFont          _font           @accessors(readonly, getter=font);
+    int             _lineBreakMode  @accessors(readonly, getter=lineBreakMode);
 }
 
 - (id)initWithCoder:(CPCoder)aCoder
@@ -68,6 +69,17 @@
         _alignment      = (flags2 & 0x1c000000) >> 26;
         _controlSize    = (flags2 & 0xE0000) >> 17;
 
+        switch ((flags2 & 0x00000F00) >> 8)
+        {
+            case 0:  _lineBreakMode = CPLineBreakByWordWrapping; break;
+            case 2:  _lineBreakMode = CPLineBreakByCharWrapping; break;
+            case 6:  _lineBreakMode = CPLineBreakByTruncatingHead; break;
+            case 8:  _lineBreakMode = CPLineBreakByTruncatingTail; break;
+            case 10: _lineBreakMode = CPLineBreakByTruncatingMiddle; break;
+            case 4:
+            default: _lineBreakMode = CPLineBreakByClipping; break;
+        }
+
         _objectValue    = [aCoder decodeObjectForKey:@"NSContents"];
         _font           = [aCoder decodeObjectForKey:@"NSSupport"];
     }
diff --git a/Tools/nib2cib/NSControl.j b/Tools/nib2cib/NSControl.j
index c6749b7b7..d259a4c8b 100644
--- a/Tools/nib2cib/NSControl.j
+++ b/Tools/nib2cib/NSControl.j
@@ -48,6 +48,8 @@
 
         [self setTarget:[aCoder decodeObjectForKey:@"NSTarget"]];
         [self setAction:[aCoder decodeObjectForKey:@"NSAction"]];
+
+        [self setLineBreakMode:[cell lineBreakMode]];
     }
     
     return self;