Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java	(revision 1333)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java	(revision 1334)
@@ -84,9 +84,7 @@
      * @param req
      *                request object
-     */
-    // TODO Konstruktor würde ich auf deprecated setzten
-    /*
-     * Grund: Laut Server Side Integeratin sollte auf jeden Fall instanceName übergeben
-     */
+     * @deprecated According to Server Side Integration, Request and instanceName should be passed at least
+     */
+    @Deprecated
     public FCKeditor(HttpServletRequest req) {
 	this(req, null, null, null, null, null);
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/FCKeditorTag.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/FCKeditorTag.java	(revision 1333)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/FCKeditorTag.java	(revision 1334)
@@ -69,4 +69,5 @@
 	private String width = null;
 	private String height = null;
+	private String prependContextPath = null;
 	private String customConfigurationsPath = null;
 	private String editorAreaCSS = null;
@@ -86,5 +87,5 @@
 	private String formatIndentator = null;
 	private String geckoUseSPAN = null;
-	private String startupFocus = null;
+	private String startupFocus = null;	
 	private String forcePasteAsPlainText = null;
 	private String forceSimpleAmpersand = null;
@@ -158,4 +159,10 @@
 	public void setHeight(String value) {
 		height=value;
+	}
+	
+	public void setPrependContextPath(String value) throws JspException {
+		if(! value.equals("true") && ! value.equals("false"))
+			throw new JspException("prependContextPath attribute can only be true or false");
+		prependContextPath=value;
 	}
 
@@ -654,17 +661,22 @@
 		if (stylesXmlPath != null)
 			fcked.getConfig().put("StylesXmlPath",stylesXmlPath);
+		
+		String contextPath;
+		if (prependContextPath == null || prependContextPath.equals("true")) {
+			contextPath = ((HttpServletRequest) pageContext.getRequest()).getContextPath();
+		} else contextPath = "";
 		if (linkBrowserURL != null)
-			fcked.getConfig().put("LinkBrowserURL",linkBrowserURL);
+			fcked.getConfig().put("LinkBrowserURL",contextPath+linkBrowserURL);
 		if (imageBrowserURL != null)
-			fcked.getConfig().put("ImageBrowserURL",imageBrowserURL);
+			fcked.getConfig().put("ImageBrowserURL",contextPath+imageBrowserURL);
 		if (flashBrowserURL != null)
-			fcked.getConfig().put("FlashBrowserURL",flashBrowserURL);
+			fcked.getConfig().put("FlashBrowserURL",contextPath+flashBrowserURL);
 		if (linkUploadURL != null)
-			fcked.getConfig().put("LinkUploadURL",linkUploadURL);
+			fcked.getConfig().put("LinkUploadURL",contextPath+linkUploadURL);
 		if (imageUploadURL != null)
-			fcked.getConfig().put("ImageUploadURL",imageUploadURL);
+			fcked.getConfig().put("ImageUploadURL",contextPath+imageUploadURL);
 		if (flashUploadURL != null)
-			fcked.getConfig().put("FlashUploadURL",flashUploadURL);
-				
+			fcked.getConfig().put("FlashUploadURL",contextPath+flashUploadURL);
+		
 		 return EVAL_BODY_BUFFERED;
 	}