--- modules/node/node.module	2008-04-09 17:11:48.000000000 -0400
+++ modules/node/node.module.new	2008-06-08 22:14:00.000000000 -0400
@@ -781,7 +781,7 @@ function node_validate($node, $form = ar
 
   // Make sure the body has the minimum number of words.
   // TODO : use a better word counting algorithm that will work in other languages
-  if (!empty($type->min_word_count) && isset($node->body) && count(explode(' ', $node->body)) < $type->min_word_count) {
+  if (!empty($type->min_word_count) && isset($node->body) && str_word_count($node->body) < $type->min_word_count) {
     form_set_error('body', t('The body of your @type is too short. You need at least %words words.', array('%words' => $type->min_word_count, '@type' => $type->name)));
   }