Index: /CKEditor.NET/trunk/CHANGES.html
===================================================================
--- /CKEditor.NET/trunk/CHANGES.html	(revision 7590)
+++ /CKEditor.NET/trunk/CHANGES.html	(revision 7591)
@@ -70,4 +70,17 @@
 	</h1>
 	<h2>
+		CKEditor for ASP.NET 3.6.4
+	</h2>
+	<p>
+			New features:</p>
+	<ul>
+		<li>Updated CKEditor to <a href="http://ckeditor.com/blog/CKEditor_3.6.4_released">3.6.4</a>.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/8608">#8608</a> : CKEditor configuration is not read by instances running in the update panel.</li>
+	</ul>
+	<h2>
 		CKEditor for ASP.NET 3.6.2
 	</h2>
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 7590)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 7591)
@@ -91,5 +91,5 @@
 			{
 				if (ViewState["CKEditorConfig"] == null)
-					ViewState["CKEditorConfig"] = new CKEditorConfig(this.BasePath);
+					ViewState["CKEditorConfig"] = new CKEditorConfig(this.BasePath.StartsWith("~") ? this.ResolveUrl(this.BasePath) : this.BasePath);
 				return (CKEditorConfig)ViewState["CKEditorConfig"];
 			}
@@ -1016,5 +1016,4 @@
 		{
 			base.TextMode = TextBoxMode.MultiLine;
-			this.config = new CKEditorConfig(this.BasePath.StartsWith("~") ? this.ResolveUrl(this.BasePath) : this.BasePath);
 		}
 
@@ -1077,4 +1076,13 @@
 		}
 
+		protected override void OnLoad(EventArgs e)
+		{
+			base.OnLoad(e);
+			if (ViewState["CKEditorConfig"] != null)
+				this.config = (CKEditorConfig)ViewState["CKEditorConfig"];
+			else
+				this.config = new CKEditorConfig(this.BasePath.StartsWith("~") ? this.ResolveUrl(this.BasePath) : this.BasePath);
+		}
+
 		#endregion