Index: typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
===================================================================
--- typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	(revision 7196)
+++ typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	(working copy)
@@ -810,7 +810,7 @@
 		}
 		$borderClass = '';
 		if ($border)	{
-			$borderClass = 'csc-textpic-border';
+			$borderClass = $conf['borderClass'] ? $conf['borderClass'] : 'csc-textpic-border';
 		}
 
 			// Multiple classes with all properties, to be styled in CSS
Index: typo3/sysext/css_styled_content/static/constants.txt
===================================================================
--- typo3/sysext/css_styled_content/static/constants.txt	(revision 7196)
+++ typo3/sysext/css_styled_content/static/constants.txt	(working copy)
@@ -67,8 +67,10 @@
     # cat=content/cImage/i3; type=int+; label= Image border, padding: Padding left and right to the image, around the border.
   borderSpace = 0
     # cat=content/cImage/i4; type=string; label= Image border CSS-selector: If you want your border to apply elsewhere, change this setting. E.g. to apply to the whole image+caption, use 'DIV.csc-textpic-border DIV.csc-textpic-imagewrap .csc-textpic-image'.
-  borderSelector = DIV.csc-textpic-border DIV.csc-textpic-imagewrap .csc-textpic-image IMG
-    # cat=content/cImage/i5; type=boolean; label= Image row separation: Whether images should be rendered/wrapped in separated rows, e.g. inside a DIV.csc-textpic-imagerow element
+  borderSelector = DIV.{$borderClass} DIV.csc-textpic-imagewrap .csc-textpic-image IMG
+    # cat=content/cImage/i5; type=string; label= Image border class: The name of the CSS class for creating image borders
+  borderClass = csc-textpic-border
+    # cat=content/cImage/i6; type=boolean; label= Image row separation: Whether images should be rendered/wrapped in separated rows, e.g. inside a DIV.csc-textpic-imagerow element
   separateRows = 1
 }
 
Index: typo3/sysext/css_styled_content/static/setup.txt
===================================================================
--- typo3/sysext/css_styled_content/static/setup.txt	(revision 7196)
+++ typo3/sysext/css_styled_content/static/setup.txt	(working copy)
@@ -512,6 +512,7 @@
 
 	borderCol = {$styles.content.imgtext.borderColor}
 	borderThick = {$styles.content.imgtext.borderThick}
+	borderClass = {$styles.content.imgtext.borderClass}
 	colSpace = {$styles.content.imgtext.colSpace}
 	rowSpace = {$styles.content.imgtext.rowSpace}
 	textMargin = {$styles.content.imgtext.textMargin}