--- typo3_src-4.0-orig/typo3/sysext/install/mod/class.tx_install.php	2006-04-07 02:18:29.000000000 +0200
+++ typo3_src-4.0/typo3/sysext/install/mod/class.tx_install.php	2006-06-15 19:29:50.000000000 +0200
@@ -467,7 +467,6 @@
 						You can change the values in case you have alternatives to the suggested defaults.
 						By this final step you will configure TYPO3 for immediate use provided that you have no fatal errors left above."
 						.$this->setupGeneral('get_form'),0,1);
-
 					echo $this->outputWrapper($this->printAll());
 
 				break;
@@ -2130,7 +2129,9 @@
 										$value_ext = 'gm';
 									} elseif(doubleval($version)<5)	{	// Assume ImageMagick 4.x
 										$value_ext = '';
-									} else	{	// Assume ImageMagick 5+
+									} elseif(doubleval($version)>=6)	{	// Assume ImageMagick 6.x
+										$value_ext = 'im6';
+									} else	{	// Assume ImageMagick 5.x
 										$value_ext = 'im5';
 									}
 									if (strcmp(strtolower($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5']),$value_ext))	{
@@ -2336,6 +2337,15 @@
 							$formArray['im_path']=array($path);
 							$found=1;
 						}
+					} elseif (doubleval($dat['convert'])>=6) {
+						$formArray['im_version_5']=array('im6');
+						if ($dat['gif_capability']=='LZW')	{
+							$formArray['im_path']=array($path);
+							$found=2;
+						} elseif ($found<2)	{
+							$formArray['im_path']=array($path);
+							$found=1;
+						}
 					} elseif (!$found)	{
 						$formArray['im_version_5']=array('im5');
 						$formArray['im_path']=array($path);