diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 2b1b430..39f4555 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -676,11 +676,16 @@
                 for ( int i = r->start; i < r->stop; i++ )
                     if ( static_cast<RenderText *>(r->obj)->text()[i].direction() == QChar::DirWS )
                         spaces++;
+
                 KHTMLAssert(spaces <= numSpaces);
-                spaceAdd = (availableWidth - totWidth)*spaces/numSpaces;
+
+                // Only justify text with white-space: normal.
+                if (r->obj->style()->whiteSpace() != PRE) {
+                    spaceAdd = (availableWidth - totWidth)*spaces/numSpaces;
+                    static_cast<TextRun*>(r->box)->setSpaceAdd(spaceAdd);
+                    totWidth += spaceAdd;
+                }
                 numSpaces -= spaces;
-                totWidth += spaceAdd;
-                static_cast<TextRun*>(r->box)->setSpaceAdd(spaceAdd);
             }
         }
     }