Index: typo3/sysext/css_styled_content/static/setup.txt
===================================================================
--- typo3/sysext/css_styled_content/static/setup.txt	(revision 9883)
+++ typo3/sysext/css_styled_content/static/setup.txt	(revision )
@@ -497,12 +497,36 @@
 			directImageLink = {$styles.content.imgtext.linkWrap.lightboxEnabled}
 
 			enable.field = image_zoom
-			enable.ifEmpty.typolink.parameter.field = image_link
-			enable.ifEmpty.typolink.parameter.listNum.stdWrap.data = register : IMAGE_NUM_CURRENT
+			enable.ifEmpty.typolink.parameter {
+				field = image_link
+				split.token.cObject = TEXT
+				split.token.cObject {
+					char = 10
+				}
+				split.token.override = ,
+				split.token.override {
+					if.value.field = image_link
+					if.equals.field = image_link
+					if.equals.br = 1
+				}
+				split.returnKey.data = register : IMAGE_NUM_CURRENT
+			}
 			enable.ifEmpty.typolink.returnLast = url
 
-			typolink.parameter.field = image_link
-			typolink.parameter.listNum.stdWrap.data = register : IMAGE_NUM_CURRENT
+			typolink.parameter {
+				field = image_link
+				split.token.cObject = TEXT
+				split.token.cObject {
+					char = 10
+				}
+				split.token.override = ,
+				split.token.override {
+					if.value.field = image_link
+					if.equals.field = image_link
+					if.equals.br = 1
+				}
+				split.returnKey.data = register : IMAGE_NUM_CURRENT
+			}
 			typolink.target = {$styles.content.links.target}
 			typolink.extTarget = {$styles.content.links.extTarget}
 
Index: typo3/sysext/cms/tbl_tt_content.php
===================================================================
--- typo3/sysext/cms/tbl_tt_content.php	(revision 9952)
+++ typo3/sysext/cms/tbl_tt_content.php	(revision )
@@ -821,11 +821,9 @@
 			'exclude' => 1,
 			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_link',
 			'config' => array(
-				'type' => 'input',
-				'size' => '50',
-				'max' => '51200',
-				'checkbox' => '',
-				'eval' => 'trim',
+				'type' => 'text',
+				'cols' => '30',
+				'rows' => '3',
 				'wizards' => array(
 					'_PADDING' => 2,
 					'link' => array(
Index: typo3/sysext/cms/locallang_ttc.xml
===================================================================
--- typo3/sysext/cms/locallang_ttc.xml	(revision 9925)
+++ typo3/sysext/cms/locallang_ttc.xml	(revision )
@@ -123,7 +123,7 @@
 			<label index="image_noRows">No rows:</label>
 			<label index="image_noRows_formlabel">Display as Rows</label>
 			<label index="image_link">Link:</label>
-			<label index="image_link_formlabel">Links (Separate with Commas, One Link per Image)</label>
+			<label index="image_link_formlabel">Links (One per Line, One Link per Image)</label>
 			<label index="image_zoom">Click-enlarge:</label>
 			<label index="image_zoom_formlabel">Enlarge on Click</label>
 			<label index="image_effects">Effects:</label>
Index: typo3/sysext/cms/ext_tables.sql
===================================================================
--- typo3/sysext/cms/ext_tables.sql	(revision 9895)
+++ typo3/sysext/cms/ext_tables.sql	(revision )
@@ -393,7 +393,7 @@
   fe_group varchar(100) DEFAULT '0' NOT NULL,
   header_link varchar(255) DEFAULT '' NOT NULL,
   imagecaption_position varchar(6) DEFAULT '' NOT NULL,
-  image_link varchar(255) DEFAULT '' NOT NULL,
+  image_link text,
   image_zoom tinyint(3) unsigned DEFAULT '0' NOT NULL,
   image_noRows tinyint(3) unsigned DEFAULT '0' NOT NULL,
   image_effects tinyint(3) unsigned DEFAULT '0' NOT NULL,
Index: typo3/class.browse_links.php
===================================================================
--- typo3/class.browse_links.php	(revision 9758)
+++ typo3/class.browse_links.php	(revision )
@@ -814,7 +814,13 @@
 
 			// CurrentUrl - the current link url must be passed around if it exists
 		if ($this->mode == 'wizard')	{
-			$currentLinkParts = t3lib_div::unQuoteFilenames($this->P['currentValue'], TRUE);
+			$currentValues = t3lib_div::trimExplode(chr(10),trim($this->P['currentValue']));
+			if(count($currentValues)> 0) {
+				$currentValue = array_pop($currentValues);
+			} else {
+				$currentValue = '';
+			}
+			$currentLinkParts = t3lib_div::unQuoteFilenames($currentValue, TRUE);
 			$initialCurUrlArray = array (
 				'href'   => $currentLinkParts[0],
 				'target' => $currentLinkParts[1],
@@ -1005,7 +1011,11 @@
 							cur_params = cur_params.replace(/\bid\=.*?(\&|$)/, "");
 						}
 						input = input + " " + cur_target + " " + cur_class + " " + cur_title + " " + cur_params;
+						if(field.className.search(/textarea/) != -1) {
+							field.value += input + "\n";
+						} else {
-						field.value = input;
+							field.value = input;
+						}
 						'.$update.'
 					}
 				}