diff --git a/typo3/sysext/css_styled_content/Configuration/TypoScript/v7/setup.txt b/typo3/sysext/css_styled_content/Configuration/TypoScript/v7/setup.txt
index 707b095cd12212238463e31983a8519008c6c011..a94c34b78ee32470647b8ddd00723240f30f95f3 100644
--- a/typo3/sysext/css_styled_content/Configuration/TypoScript/v7/setup.txt
+++ b/typo3/sysext/css_styled_content/Configuration/TypoScript/v7/setup.txt
@@ -712,6 +712,7 @@ tt_content.image.20 {
 			width = {$styles.content.imgtext.linkWrap.width}
 			height = {$styles.content.imgtext.linkWrap.height}
 			effects = {$styles.content.imgtext.linkWrap.effects}
+			crop.data = file:current:crop
 
 			JSwindow = 1
 			JSwindow.newWindow = {$styles.content.imgtext.linkWrap.newWindow}
diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index ad1806a1bc7b6b8a37be7e89f0bf2b60af0258c0..e419935f4a4ae75df667724f3574bcfa1e7ca23a 100644
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -712,6 +712,7 @@ tt_content.image.20 {
 			width = {$styles.content.imgtext.linkWrap.width}
 			height = {$styles.content.imgtext.linkWrap.height}
 			effects = {$styles.content.imgtext.linkWrap.effects}
+			crop.data = file:current:crop
 
 			JSwindow = 1
 			JSwindow.newWindow = {$styles.content.imgtext.linkWrap.newWindow}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts
index 6fceae14de94a4ef0d954108f8563e88641b251d..00308ef3d1dcbc979cb4c2aa842c3b6a6493a5e6 100644
--- a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts
+++ b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts
@@ -24,6 +24,7 @@ lib.fluidContent {
 				wrap = <a href="javascript:close();"> | </a>
 				width = {$styles.content.textmedia.linkWrap.width}
 				height = {$styles.content.textmedia.linkWrap.height}
+				crop.data = file:current:crop
 
 				JSwindow = 1
 				JSwindow {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index ea9be11573461e15f2aad09f75524d8f005c70a1..43da6b1d6c6cbd415e583a3af00d3fcb43a59983 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -1397,7 +1397,7 @@ class ContentObjectRenderer
 
         // Create imageFileLink if not created with typolink
         if ($content === $string) {
-            $parameterNames = array('width', 'height', 'effects', 'bodyTag', 'title', 'wrap');
+            $parameterNames = array('width', 'height', 'effects', 'bodyTag', 'title', 'wrap', 'crop');
             $parameters = array();
             $sample = isset($conf['sample.']) ? $this->stdWrap($conf['sample'], $conf['sample.']) : $conf['sample'];
             if ($sample) {
diff --git a/typo3/sysext/frontend/Classes/Controller/ShowImageController.php b/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
index 3c366912ee682d7c088c5b12b04115c18d3ff857..50526efd844671ec9a7c2824ba033fcc32ce0b45 100644
--- a/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
+++ b/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
@@ -56,6 +56,11 @@ class ShowImageController
      */
     protected $height;
 
+    /**
+     * @var string
+     */
+    protected $crop;
+
     /**
      * @var int
      */
@@ -178,7 +183,7 @@ EOF;
             'width' => $this->width,
             'height' => $this->height,
             'frame' => $this->frame,
-
+            'crop' => $this->crop,
         );
         return $this->file->process('Image.CropScaleMask', $processingConfiguration);
     }