Index: /FCKeditor.Net/trunk/FCKeditor.cs
===================================================================
--- /FCKeditor.Net/trunk/FCKeditor.cs	(revision 2281)
+++ /FCKeditor.Net/trunk/FCKeditor.cs	(revision 2282)
@@ -45,4 +45,6 @@
 	public class FCKeditor : System.Web.UI.Control, IPostBackDataHandler
 	{
+		private bool _IsCompatible ;
+
 		public FCKeditor()
 		{}
@@ -343,5 +345,5 @@
 			writer.Write( "<div>" ) ;
 
-			if ( this.CheckBrowserCompatibility() )
+			if ( _IsCompatible )
 			{
 				string sLink = this.BasePath ;
@@ -389,4 +391,69 @@
 
 			writer.Write( "</div>" ) ;
+
+		}
+
+		protected override void OnPreRender( EventArgs e )
+		{
+			base.OnPreRender( e );
+			
+			_IsCompatible = this.CheckBrowserCompatibility();
+
+			if ( !_IsCompatible )
+				return;
+
+			object oScriptManager = null;
+
+			// Search for the ScriptManager control in the page.
+			Control oParent = this.Parent;
+			while ( oParent != null )
+			{
+				foreach ( object control in oParent.Controls )
+				{
+					// Match by type name.
+					if ( control.GetType().FullName == "System.Web.UI.ScriptManager" )
+					{
+						oScriptManager = control;
+						break;
+					}
+				}
+
+				if ( oScriptManager != null )
+					break;
+
+				oParent = oParent.Parent;
+			}
+
+			// If the ScriptManager control is available.
+			if ( oScriptManager != null )
+			{
+				try
+				{
+					// Use reflection to check the SupportsPartialRendering
+					// property value.
+					bool bSupportsPartialRendering = ((bool)(oScriptManager.GetType().GetProperty( "SupportsPartialRendering" ).GetValue( oScriptManager, null )));
+
+					if ( bSupportsPartialRendering )
+					{
+						string sScript = "(function()\n{\n" +
+							"\tvar editor = FCKeditorAPI.GetInstance('" + this.ClientID + "');\n" +
+							"\tif (editor)\n" +
+							"\t\teditor.UpdateLinkedField();\n" +
+							"})();\n";
+
+						// Call the RegisterOnSubmitStatement method through
+						// reflection.
+						oScriptManager.GetType().GetMethod( "RegisterOnSubmitStatement", new Type[] { typeof( Control ), typeof( Type ), typeof( String ), typeof( String ) } ).Invoke( oScriptManager, new object[] {
+							this,
+							this.GetType(),
+							"FCKeditorAjaxOnSubmit_" + this.ClientID,
+							sScript } );
+
+						// Tell the editor that we are handling the submit.
+						this.Config[ "PreventSubmitHandler" ] = "true";
+					}
+				}
+				catch { }
+			}
 		}
 
Index: /FCKeditor.Net/trunk/_whatsnew.html
===================================================================
--- /FCKeditor.Net/trunk/_whatsnew.html	(revision 2281)
+++ /FCKeditor.Net/trunk/_whatsnew.html	(revision 2282)
@@ -34,5 +34,5 @@
 		FCKeditor.Net ChangeLog - What's New?</h1>
 	<h3>
-		Version 2.6.1 (SVN)</h3>
+		Version 2.6.3 (SVN)</h3>
 	<p>
 		New Features and Improvements:</p>
@@ -45,4 +45,6 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1908">#1908</a>] &amp;amp; was
 			decoded at the wrong time in the server, leading to data loss.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/234">#234</a>] Fixed 
+ 			the incompatibility with the Microsoft ASP.Net AJAX UpdatePanel.</li> 
 	</ul>
 	<h3>
