diff --git a/ChangeLog b/ChangeLog
index 59f96c2..0868745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+2023-03-28  Akib Azmain Turja  <akib@disroot.org>
+
+	Fix bugs in selection data manipulation code
+
+	* eat.el (eat--t-term): Put a vector of length 8 (instead of
+	10) in 'cut-buffers' slot.
+	* eat.el (eat--t-manipulate-selection): Don't process the
+	targets '8' and '9', since they are not in the protocol.
+	Return correct list of queried targets to the client.  Make
+	sure base64 encoded data doesn't contain line breaks.
+	* eat.el (eat--t-handle-output): Tolerate invalid targets in
+	OSC 52 (manipulate selection data).
+	* eat.el (eat--manipulate-kill-ring): Handle 'nil' correctly.
+
+2023-03-21  Akib Azmain Turja  <akib@disroot.org>
+
+	Fix incompatiblity with Eshell on Emacs 28
+
+	* eat.el (eat--eshell-setup-proc-and-term): Set
+	'eat--input-process' terminal parameter on Emacs 28.
+	* eat.el (eat-eshell-mode): Don't add advice
+	'eat--eshell-set-input-process' on Emacs 28.
+
+2023-03-20  Akib Azmain Turja  <akib@disroot.org>
+
+	Send input to correct process in Eshell pipeline
+
+	* eat.el (eat--process): Remove.
+	* eat.el (eat-mode): Don't make 'eat--process' buffer-local.
+	Use 'eat--terminal' to determine whether terminal is live.
+	* eat.el (eat--eshell-set-input-process): New function.
+	* eat.el (eat--eshell-local-mode): Don't make 'eat--process'
+	buffer-local.  Add 'eat--eshell-set-input-process' as a advice
+	after 'eshell-resume-eval'.
+	* eat.el (eat-exec): Use the terminal parameters
+	'eat--process', 'eat--input-process' and 'eat--output-process'
+	instead of the buffer-local variable 'eat--process' store the
+	process object.
+	* eat.el (eat--sentinel): Don't set 'eat--process' to nil.
+	* eat.el (eat--eshell-setup-proc-and-term): Set the terminal
+	parameters instead of buffer-local 'eat--process'.
+	* eat.el (eat--pre-prompt, eat--pre-cmd, eat-kill-process, eat)
+	(eat--send-input, eat--trace-eshell-adjust-make-process-args)
+	(eat--eshell-cleanup, eat--eshell-output-filter): Get the
+	process from terminal parameter.
+
 2023-02-08  Akib Azmain Turja  <akib@disroot.org>
 
 	* eat.texi (Querying Before Kill): New chapter
diff --git a/eat.el b/eat.el
index 8780922..def750e 100644
--- a/eat.el
+++ b/eat.el
@@ -4,7 +4,7 @@
 
 ;; Author: Akib Azmain Turja <akib@disroot.org>
 ;; Created: 2022-08-15
-;; Version: 0.6
+;; Version: 0.6.1
 ;; Package-Requires: ((emacs "28.1"))
 ;; Keywords: terminals processes
 ;; Homepage: https://codeberg.org/akib/emacs-eat
diff --git a/eat.texi b/eat.texi
index efa2215..1a0611d 100644
--- a/eat.texi
+++ b/eat.texi
@@ -2,9 +2,8 @@
 
 @comment %**start of header
 @setfilename eat.info
-@set UPDATED 08 February 2023
-@set EDITION 0.6
-@set VERSION 0.6
+@set UPDATED 28 March 2023
+@set VERSION 0.6.1
 @documentencoding UTF-8
 @codequotebacktick on
 @codequoteundirected on