diff --git a/eventpoll.c b/eventpoll.c
index 5510e8e7e..f2ab8add6 100644
--- a/eventpoll.c
+++ b/eventpoll.c
@@ -21,13 +21,16 @@
 #include "util.h"
 #include "log.h"
 
+#include "protobuf.h"
+#include "protobuf/eventpoll.pb-c.h"
+
 struct eventpoll_file_info {
-	struct eventpoll_file_entry	*efe;
+	EventpollFileEntry		*efe;
 	struct file_desc		d;
 };
 
 struct eventpoll_tfd_file_info {
-	struct eventpoll_tfd_entry	*tdefe;
+	EventpollTfdEntry		*tdefe;
 	struct list_head		list;
 };
 
@@ -39,31 +42,32 @@ int is_eventpoll_link(int lfd)
 	return is_anon_link_type(lfd, "[eventpoll]");
 }
 
-static void pr_info_eventpoll_tfd(char *action, struct eventpoll_tfd_entry *e)
+static void pr_info_eventpoll_tfd(char *action, EventpollTfdEntry *e)
 {
 	pr_info("%seventpoll-tfd: id %#08x tfd %#08x events %#08x data %#016lx\n",
 		action, e->id, e->tfd, e->events, e->data);
 }
 
-static void pr_info_eventpoll(char *action, struct eventpoll_file_entry *e)
+static void pr_info_eventpoll(char *action, EventpollFileEntry *e)
 {
 	pr_info("%seventpoll: id %#08x flags %#04x\n", action, e->id, e->flags);
 }
 
 void show_eventpoll_tfd(int fd, struct cr_options *o)
 {
-	struct eventpoll_tfd_entry e;
+	EventpollTfdEntry *e;
 
 	pr_img_head(CR_FD_EVENTPOLL_TFD);
 
 	while (1) {
 		int ret;
 
-		ret = read_img_eof(fd, &e);
+		ret = pb_read_eof(fd, &e, eventpoll_tfd_entry);
 		if (ret <= 0)
 			goto out;
 		pr_msg("id: %#08x tfd %#08x events %#08x data %#016lx\n",
-		       e.id, e.tfd, e.events, e.data);
+		       e->id, e->tfd, e->events, e->data);
+		eventpoll_tfd_entry__free_unpacked(e, NULL);
 	}
 
 out:
@@ -72,20 +76,21 @@ out:
 
 void show_eventpoll(int fd, struct cr_options *o)
 {
-	struct eventpoll_file_entry e;
+	EventpollFileEntry *e;
 
 	pr_img_head(CR_FD_EVENTPOLL);
 
 	while (1) {
 		int ret;
 
-		ret = read_img_eof(fd, &e);
+		ret = pb_read_eof(fd, &e, eventpoll_file_entry);
 		if (ret <= 0)
 			goto out;
 		pr_msg("id: %#08x flags %#04x ",
-		       e.id, e.flags);
-		show_fown_cont(&e.fown);
+		       e->id, e->flags);
+		/* FIXME Show fown */
 		pr_msg("\n");
+		eventpoll_file_entry__free_unpacked(e, NULL);
 	}
 
 out:
@@ -94,23 +99,28 @@ out:
 
 static int dump_eventpoll_entry(union fdinfo_entries *e, void *arg)
 {
-	struct eventpoll_tfd_entry *efd = &e->epl;
+	EventpollTfdEntry *efd = &e->epl;
 
 	efd->id = *(u32 *)arg;
 	pr_info_eventpoll_tfd("Dumping: ", efd);
-	return write_img(fdset_fd(glob_fdset, CR_FD_EVENTPOLL_TFD), efd);
+	return pb_write(fdset_fd(glob_fdset, CR_FD_EVENTPOLL_TFD),
+			efd, eventpoll_tfd_entry);
 }
 
 static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
 {
-	struct eventpoll_file_entry e;
+	EventpollFileEntry e = EVENTPOLL_FILE_ENTRY__INIT;
+	FownEntry fown;
+
+	pb_prep_fown(&fown, &p->fown);
 
 	e.id = id;
 	e.flags = p->flags;
-	e.fown = p->fown;
+	e.fown = &fown;
 
 	pr_info_eventpoll("Dumping ", &e);
-	if (write_img(fdset_fd(glob_fdset, CR_FD_EVENTPOLL), &e))
+	if (pb_write(fdset_fd(glob_fdset, CR_FD_EVENTPOLL),
+		     &e, eventpoll_file_entry))
 		return -1;
 
 	return parse_fdinfo(lfd, FDINFO_EVENTPOLL, dump_eventpoll_entry, &id);
@@ -131,6 +141,7 @@ static int eventpoll_open(struct file_desc *d)
 {
 	struct eventpoll_tfd_file_info *td_info;
 	struct eventpoll_file_info *info;
+	fown_t fown;
 	int tmp, ret;
 
 	info = container_of(d, struct eventpoll_file_info, d);
@@ -142,7 +153,13 @@ static int eventpoll_open(struct file_desc *d)
 		return -1;
 	}
 
-	if (rst_file_params(tmp, &info->efe->fown, info->efe->flags)) {
+	fown.uid	= info->efe->fown->uid;
+	fown.euid	= info->efe->fown->uid;
+	fown.signum	= info->efe->fown->signum;
+	fown.pid_type	= info->efe->fown->pid_type;
+	fown.pid	= info->efe->fown->pid;
+
+	if (rst_file_params(tmp, &fown, info->efe->flags)) {
 		pr_perror("Can't restore file params on epoll %#08x",
 			  info->efe->id);
 		goto err_close;
@@ -195,7 +212,7 @@ int collect_eventpoll(void)
 		} else
 			goto err;
 
-		ret = read_img_eof(image_fd, info->tdefe);
+		ret = pb_read_eof(image_fd, &info->tdefe, eventpoll_tfd_entry);
 		if (ret < 0)
 			goto err;
 		else if (!ret)
@@ -216,15 +233,12 @@ int collect_eventpoll(void)
 	while (1) {
 		struct eventpoll_file_info *info;
 
+		ret = -1;
 		info = xmalloc(sizeof(*info));
-		if (info) {
-			info->efe = xmalloc(sizeof(*info->efe));
-			if (!info->efe)
-				goto err;
-		} else
+		if (!info)
 			goto err;
 
-		ret = read_img_eof(image_fd, info->efe);
+		ret = pb_read_eof(image_fd, &info->efe, eventpoll_file_entry);
 		if (ret < 0)
 			goto err;
 		else if (!ret)
diff --git a/include/image.h b/include/image.h
index 1f961e83e..be3298886 100644
--- a/include/image.h
+++ b/include/image.h
@@ -75,19 +75,6 @@ typedef struct {
  */
 #define REMAP_GHOST	(1 << 31)
 
-struct eventpoll_tfd_entry {
-	u32	id;
-	u32	tfd;
-	u32	events;
-	u64	data;
-} __packed;
-
-struct eventpoll_file_entry {
-	u32	id;
-	u32	flags;
-	fown_t	fown;
-} __packed;
-
 struct inotify_wd_entry {
 	u32	id;
 	u64	i_ino;
diff --git a/include/proc_parse.h b/include/proc_parse.h
index 3d5ac3721..b3b33589c 100644
--- a/include/proc_parse.h
+++ b/include/proc_parse.h
@@ -7,6 +7,7 @@
 #include "list.h"
 
 #include "../protobuf/eventfd.pb-c.h"
+#include "../protobuf/eventpoll.pb-c.h"
 
 #define PROC_TASK_COMM_LEN	32
 #define PROC_TASK_COMM_LEN_FMT	"(%31s"
@@ -121,7 +122,7 @@ extern int parse_pid_status(pid_t pid, struct proc_status_creds *);
 
 union fdinfo_entries {
 	EventfdFileEntry efd;
-	struct eventpoll_tfd_entry epl;
+	EventpollTfdEntry epl;
 	struct inotify_wd_entry ify;
 };
 
diff --git a/proc_parse.c b/proc_parse.c
index 7c008284c..074dee690 100644
--- a/proc_parse.c
+++ b/proc_parse.c
@@ -742,6 +742,8 @@ int parse_fdinfo(int fd, int type,
 			continue;
 		}
 		if (fdinfo_field(str, "tfd")) {
+			eventpoll_tfd_entry__init(&entry.epl);
+
 			if (type != FDINFO_EVENTPOLL)
 				goto parse_err;
 			ret = sscanf(str, "tfd: %d events: %x data: %lx",
diff --git a/protobuf/Makefile b/protobuf/Makefile
index 2aa55cf49..9fd82c704 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -26,6 +26,7 @@ PROTO_FILES	+= ghost-file.proto
 PROTO_FILES	+= fifo.proto
 PROTO_FILES	+= remap-file-path.proto
 PROTO_FILES	+= eventfd.proto
+PROTO_FILES	+= eventpoll.proto
 
 HDRS	:= $(patsubst %.proto,%.pb-c.h,$(PROTO_FILES))
 SRCS	:= $(patsubst %.proto,%.pb-c.c,$(PROTO_FILES))
diff --git a/protobuf/eventpoll.proto b/protobuf/eventpoll.proto
new file mode 100644
index 000000000..5da242dba
--- /dev/null
+++ b/protobuf/eventpoll.proto
@@ -0,0 +1,14 @@
+import "fown.proto";
+
+message eventpoll_tfd_entry {
+	required uint32		id	= 1;
+	required uint32		tfd	= 2;
+	required uint32		events	= 3;
+	required uint64		data	= 4;
+}
+
+message eventpoll_file_entry {
+	required uint32		id	= 1;
+	required uint32		flags	= 2;
+	required fown_entry	fown	= 3;
+}