diff --git a/core/simplegraph.class.inc.php b/core/simplegraph.class.inc.php
index 1dffe56af..8a5ea1a31 100644
--- a/core/simplegraph.class.inc.php
+++ b/core/simplegraph.class.inc.php
@@ -516,7 +516,7 @@ EOF
 			@fwrite($rFile, $sDotDescription);
 			@fclose($rFile);
 			$aOutput = array();
-			$CommandLine = "\"$sDotExecutable\" -v -Tpng < $sDotFilePath -o$sImageFilePath 2>&1";
+			$CommandLine = "\"$sDotExecutable\" -v -Tpng < \"$sDotFilePath\" -o\"$sImageFilePath\" 2>&1";
 		
 			exec($CommandLine, $aOutput, $iRetCode);
 			if ($iRetCode != 0)
@@ -572,7 +572,7 @@ EOF
 			@fwrite($rFile, $sDotDescription);
 			@fclose($rFile);
 			$aOutput = array();
-			$CommandLine = "\"$sDotExecutable\" -v -Tdot < $sDotFilePath -o$sXdotFilePath 2>&1";
+			$CommandLine = "\"$sDotExecutable\" -v -Tdot < \"$sDotFilePath\" -o\"$sXdotFilePath\" 2>&1";
 	
 			exec($CommandLine, $aOutput, $iRetCode);
 			if ($iRetCode != 0)