diff -Naur phpbb2drupal/phpbb2drupal.module phpbb2drupal-fixed/phpbb2drupal.module
--- phpbb2drupal/phpbb2drupal.module	2008-10-20 23:56:59.000000000 +0200
+++ phpbb2drupal-fixed/phpbb2drupal.module	2008-12-26 13:38:33.531250000 +0100
@@ -733,8 +733,9 @@
 
         while ($file = db_fetch_object($files)) {
           db_set_active('default');
-          db_query("INSERT INTO {files} (nid, filename, filepath, filemime, filesize) VALUES (%d, '%s', '%s', '%s', %d)", $node->nid, substr($file->real_filename0, 255), substr("$file_path/$file->physical_filename", 0, 255), substr($file->mimetype, 0, 255), $file->filesize);
+          db_query("INSERT INTO {files} (uid, filename, filepath, filemime, filesize, status, timestamp) VALUES (%d, '%s', '%s', '%s', %d, %d, %d)", $uid, substr($file->real_filename, 0, 255), substr("$file_path/$file->physical_filename", 0, 255), substr($file->mimetype, 0, 255), $file->filesize, 1, $file->filetime);
           $fid = db_last_insert_id('files', 'fid');
+          db_query("INSERT INTO {upload} (fid, nid, vid, description, list, weight) VALUES (%d, %d, %d, '%s', %d, %d)", $fid, $node->nid, $node->nid, substr($file->real_filename, 0, 255), 1, $file->attach_id);
           db_set_active('phpbb');
         }
       }
@@ -948,6 +949,7 @@
 function phpbb2drupal_import_posts() {
   $pre = variable_get('phpbb2drupal_table_prefix', 'phpbb_');
   $PHPBB2DRUPAL_IMPORT_ATTACHMENTS = variable_get('phpbb2drupal_import_attachments', 0);
+  $input_format = variable_get('phpbb2drupal_input_format', 0);
 
   db_set_active('default');
   // check if the post database has been successfully imported
@@ -1051,7 +1053,8 @@
         'subject' => $post->post_subject,
         'comment' => $post->post_text,
         'hostname' => $hostname,
-        'timestamp' => $post->post_time
+        'timestamp' => $post->post_time,
+        'format' => $input_format
       );
 
       // if the title field is empty, use the node title as default.
@@ -1079,9 +1082,9 @@
 
           while ($file = db_fetch_object($files)) {
             db_set_active('default');
-            db_query("INSERT INTO {files} (nid, filename, filepath, filemime, filesize) VALUES (%d, '%s', '%s', '%s', %d)", 0, substr($file->real_filename, 0, 255), substr("$file_path/$file->physical_filename", 0, 255), substr($file->mimetype, 0, 255), $file->filesize);
+            db_query("INSERT INTO {files} (uid, filename, filepath, filemime, filesize, status, timestamp) VALUES (%d, '%s', '%s', '%s', %d, %d, %d)", $uid, substr($file->real_filename, 0, 255), substr("$file_path/$file->physical_filename", 0, 255), substr($file->mimetype, 0, 255), $file->filesize, 1, $file->filetime);
             $fid = db_last_insert_id('files', 'fid');
-            db_query('INSERT INTO {comment_files} (cid, fid) VALUES (%d, %d)', $cid, $fid);
+            db_query("INSERT INTO {comment_upload} (fid, nid, cid, description, list, weight) VALUES (%d, %d, %d, '%s', %d, %d)", $fid, $nid, $cid, substr($file->real_filename, 0, 255), 1, $file->attach_id);
             db_set_active('phpbb');
           }        
         }
diff -Naur phpbb2drupal/phpbb2privatemsg.module phpbb2drupal-fixed/phpbb2privatemsg.module
--- phpbb2drupal/phpbb2privatemsg.module	2008-12-13 02:57:35.000000000 +0100
+++ phpbb2drupal-fixed/phpbb2privatemsg.module	2008-12-26 13:38:40.531250000 +0100
@@ -138,7 +138,7 @@
       );
 
 	    //save message if no duplicates
-	    $dupe = db_result(db_query('SELECT COUNT(*) FROM {pm_message}, {pm_index}  WHERE author = %d AND timestamp = %d AND pm.mid = pmi.mid AND pmi.uid = %d', $message['author'], $message['timestamp'], $message['uid']));
+	    $dupe = db_result(db_query('SELECT COUNT(*) FROM {pm_message} pm, {pm_index} pmi  WHERE author = %d AND timestamp = %d AND pm.mid = pmi.mid AND pmi.uid = %d', $message['author'], $message['timestamp'], $message['uid']));
 	    if ($dupe <> 0) {
         $message['mid'] = $dupe['mid'];
       }