--- filefield.module	2008-04-14 18:39:12.000000000 -0500
+++ filefield.module.patched	2008-04-14 18:36:14.000000000 -0500
@@ -156,6 +156,7 @@ function filefield_file_insert($node, $f
   if (function_exists('token_replace')) {
     global $user;
     $widget_file_path = token_replace($field['widget']['file_path'], 'user', $user);
+    $widget_file_path = token_replace($widget_file_path, 'node', $node);
   }
   else {
     $widget_file_path = $field['widget']['file_path'];
@@ -291,6 +292,7 @@ function filefield_widget_settings($op, 
       );
       if (function_exists('token_replace')) {
         $form['file_path']['#description'] .= theme('token_help', 'user');
+        $form['file_path']['#description'] .= theme('token_help', 'node');
       }
       return $form;
     case 'validate':