diff --git a/search2/indexing/extractorCore.inc.php b/search2/indexing/extractorCore.inc.php
index 0a19fb2..7acafcf 100755
--- a/search2/indexing/extractorCore.inc.php
+++ b/search2/indexing/extractorCore.inc.php
@@ -370,7 +370,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor
 			$script_name = $script_prefix . '.bat';
 
 			$script = "rem This is an auto generated file. \n";
-			$script .= $cmd . ' 2> ' . $script_out . "\r\n";
+			$script .= $cmd . ' 2> "' . $script_out . "\"\r\n";
 		}
 		else
 		{
@@ -378,7 +378,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor
 
 			$script = "#!/bin/sh\n";
 			$script .= "# This is an auto generated file. \n";
-			$script .= $cmd . ' 2> ' . $script_out . "\n";
+			$script .= $cmd . ' 2> "' . $script_out . "\"\n";
 			$script .= "exit $?\n";
 		}
 
diff --git a/search2/indexing/extractors/PDFExtractor.inc.php b/search2/indexing/extractors/PDFExtractor.inc.php
index 39cbc79..6d9b83a 100755
--- a/search2/indexing/extractors/PDFExtractor.inc.php
+++ b/search2/indexing/extractors/PDFExtractor.inc.php
@@ -41,7 +41,7 @@ class PDFExtractor extends ApplicationExtractor
 	public function __construct()
 	{
 		$config = KTConfig::getSingleton();
-		$params = $config->get('extractorParameters/pdftotext', '-nopgbrk -enc UTF-8 \'{source}\' \'{target}\'');
+		$params = $config->get('extractorParameters/pdftotext', '-nopgbrk -enc UTF-8 "{source}" "{target}"');
 
 		parent::__construct('externalBinary','pdftotext','pdftotext',_kt('PDF Text Extractor'),$params);
 	}