diff --git a/filefield_paths.install b/filefield_paths.install
index 7c10044..7710f15 100644
--- a/filefield_paths.install
+++ b/filefield_paths.install
@@ -51,6 +51,10 @@ function filefield_paths_install() {
     db_query("UPDATE {files} SET origname = '%s' WHERE fid = %d", $file->filename, $file->fid);
   }
 
+  // Filefield paths need to run after content.module during hook_nodeapi
+  // 'insert'. See issue http://drupal.org/node/626314
+  db_query("UPDATE {system} SET weight = 1 WHERE name = 'filefield_paths'");
+
   variable_set('filefield_paths_schema_version', 6103);
 }
 
@@ -194,3 +198,7 @@ function filefield_paths_update_6103() {
 
   return array();
 }
+
+function filefield_paths_update_6104() {
+  return array(update_sql("UPDATE {system} SET weight = 1 WHERE name = 'filefield_paths'"));
+}