diff --git a/doc/ChangeLog b/doc/ChangeLog
index 91496c871..b55e6152d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-26  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.texi (Literal examples): Add documentation for line
+	numbering in and references to code examples.
+	(CSS support): Fix the description of default CSS styles.
+
 2008-12-22  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.texi (Capturing column view): Document
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9388d9dd0..ceb2b95e8 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,31 @@
+2008-12-26  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-export-latex.el (org-export-latex-links): Handle coderef
+	links.
+
+	* org.el (org-bracket-link-analytic-regexp++): New variable.
+	(org-make-link-regexps): Initialize
+	`org-bracket-link-analytic-regexp++'.
+	(org-store-link): Implement special case in edit-src buffer.
+	(org-insert-link): No use of ide to insert stored links.
+	(org-link-search): Implement special case for coderefs.
+
+	* org-exp.el (org-export-html-scripts): New constant.
+	(org-export-html-style-default): Add a new style for highlighted
+	code.
+	(org-export-code-refs): New variable.
+	(org-export-preprocess-string): Initialize `org-export-code-refs'.
+	Call `org-export-replace-src-segments-and-examples'
+	No longer call `org-export-protect-examples'.
+	(org-export-target-internal-links): Take care of coderef targets.
+	(org-export-last-code-line-counter-value): New variable.
+	(org-export-replace-src-segments-and-examples): Renamed from
+	`org-export-replace-src-segments', and modified.
+	(org-export-format-source-code-or-example): Renamed from
+	`org-export-format-source-code'.
+	(org-export-number-lines): New function.
+	(org-export-as-ascii, org-export-as-html): Handle coderef links.
+
 2008-12-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-remember.el (org-remember-handler): Safer way to get a new