diff --git a/search2/indexing/extractors/OpenOfficeTextExtractor.inc.php b/search2/indexing/extractors/OpenOfficeTextExtractor.inc.php
index c81f148..99d1193 100644
--- a/search2/indexing/extractors/OpenOfficeTextExtractor.inc.php
+++ b/search2/indexing/extractors/OpenOfficeTextExtractor.inc.php
@@ -72,6 +72,11 @@ class OpenOfficeTextExtractor extends ExternalDocumentExtractor
 		);
 	}
 
+	public function needsIntermediateSourceFile()
+	{
+		return true;
+	}
+
 	protected function filter($text)
 	{
 		 return preg_replace ("@(</?[^>]*>)+@", " ", $text);
@@ -83,7 +88,7 @@ class OpenOfficeTextExtractor extends ExternalDocumentExtractor
 		$temp_dir = $config->get('urls/tmpDirectory');
 
 		$docid = $this->document->getId();
-		$time = 'openoffice_'. time() . '-' . $docid;
+		$time = 'ktindexer_openoffice_'. time() . '-' . $docid;
 		$this->openxml_dir = $temp_dir . '/' . $time;
 
 		$this->sourcefile = str_replace('\\','/',$this->sourcefile);
@@ -108,14 +113,7 @@ class OpenOfficeTextExtractor extends ExternalDocumentExtractor
 			return false;
 		}
 
-		$result = @rename($filename, $this->targetfile);
-
-		if ($result === false)
-		{
-		    return false;
-		}
-
-        $result = file_put_contents($this->targetfile, $this->filter(file_get_contents($this->targetfile)));
+        $result = file_put_contents($this->targetfile, $this->filter(file_get_contents($filename)));
 
 		return $result !== false;
 	}
diff --git a/search2/indexing/extractors/OpenXmlTextExtractor.inc.php b/search2/indexing/extractors/OpenXmlTextExtractor.inc.php
index 8bbf574..6a6fd9f 100644
--- a/search2/indexing/extractors/OpenXmlTextExtractor.inc.php
+++ b/search2/indexing/extractors/OpenXmlTextExtractor.inc.php
@@ -7,31 +7,31 @@
  * Document Management Made Simple
  * Copyright (C) 2008 KnowledgeTree Inc.
  * Portions copyright The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  *
@@ -60,6 +60,11 @@ class OpenXmlTextExtractor extends ExternalDocumentExtractor
 		return _kt('Open Xml Text Extractor');
 	}
 
+	public function needsIntermediateSourceFile()
+	{
+		return true;
+	}
+
 	/**
 	 * Return a list of all Office 2007 document types that are supported
 	 *
@@ -147,7 +152,7 @@ class OpenXmlTextExtractor extends ExternalDocumentExtractor
 		$temp_dir = $config->get('urls/tmpDirectory');
 
 		$docid = $this->document->getId();
-		$time = 'openxml_'. time() . '-' . $docid;
+		$time = 'ktindexer_openxml_'. time() . '-' . $docid;
 		$this->openxml_dir = $temp_dir . '/' . $time;
 
 		$this->sourcefile = str_replace('\\','/',$this->sourcefile);