diff --git a/examples/universal.c b/examples/universal.c
index 558b0b2..470fb91 100644
--- a/examples/universal.c
+++ b/examples/universal.c
@@ -273,6 +273,9 @@ doparse (FILE *fp, device_data_t *devdata, const unsigned char data[], unsigned
 	case DEVICE_TYPE_HW_OSTC:
 		rc = hw_ostc_parser_create (&parser);
 		break;
+	case DEVICE_TYPE_CRESSI_EDY:
+		rc = cressi_edy_parser_create (&parser);
+		break;
 	default:
 		rc = PARSER_STATUS_ERROR;
 		break;
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f47f5e..9aec5cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,7 +80,7 @@ libdivecomputer_la_SOURCES = \
 	hw.h \
 	hw_ostc.h hw_ostc.c hw_ostc_parser.c \
 	cressi.h \
-	cressi_edy.h cressi_edy.c \
+	cressi_edy.h cressi_edy.c cressi_edy_parser.c \
 	ringbuffer.h ringbuffer.c \
 	checksum.h checksum.c \
 	array.h array.c \
diff --git a/src/cressi_edy.h b/src/cressi_edy.h
index 9ebc762..0795f9e 100644
--- a/src/cressi_edy.h
+++ b/src/cressi_edy.h
@@ -23,6 +23,7 @@
 #define CRESSI_EDY_H
 
 #include "device.h"
+#include "parser.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,6 +35,9 @@ extern "C" {
 device_status_t
 cressi_edy_device_open (device_t **device, const char* name);
 
+parser_status_t
+cressi_edy_parser_create (parser_t **parser);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/src/cressi_edy_parser.c b/src/cressi_edy_parser.c
new file mode 100644
index 0000000..44a2d17
--- /dev/null
+++ b/src/cressi_edy_parser.c
@@ -0,0 +1,156 @@
+/*
+ * libdivecomputer
+ *
+ * Copyright (C) 2010 Jef Driesen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include "cressi_edy.h"
+#include "parser-private.h"
+#include "utils.h"
+#include "array.h"
+
+typedef struct cressi_edy_parser_t cressi_edy_parser_t;
+
+struct cressi_edy_parser_t {
+	parser_t base;
+};
+
+static parser_status_t cressi_edy_parser_set_data (parser_t *abstract, const unsigned char *data, unsigned int size);
+static parser_status_t cressi_edy_parser_get_datetime (parser_t *abstract, dc_datetime_t *datetime);
+static parser_status_t cressi_edy_parser_samples_foreach (parser_t *abstract, sample_callback_t callback, void *userdata);
+static parser_status_t cressi_edy_parser_destroy (parser_t *abstract);
+
+static const parser_backend_t cressi_edy_parser_backend = {
+	PARSER_TYPE_CRESSI_EDY,
+	cressi_edy_parser_set_data, /* set_data */
+	cressi_edy_parser_get_datetime, /* datetime */
+	cressi_edy_parser_samples_foreach, /* samples_foreach */
+	cressi_edy_parser_destroy /* destroy */
+};
+
+
+static int
+parser_is_cressi_edy (parser_t *abstract)
+{
+	if (abstract == NULL)
+		return 0;
+
+    return abstract->backend == &cressi_edy_parser_backend;
+}
+
+
+parser_status_t
+cressi_edy_parser_create (parser_t **out)
+{
+	if (out == NULL)
+		return PARSER_STATUS_ERROR;
+
+	// Allocate memory.
+	cressi_edy_parser_t *parser = (cressi_edy_parser_t *) malloc (sizeof (cressi_edy_parser_t));
+	if (parser == NULL) {
+		WARNING ("Failed to allocate memory.");
+		return PARSER_STATUS_MEMORY;
+	}
+
+	// Initialize the base class.
+	parser_init (&parser->base, &cressi_edy_parser_backend);
+
+	*out = (parser_t*) parser;
+
+	return PARSER_STATUS_SUCCESS;
+}
+
+
+static parser_status_t
+cressi_edy_parser_destroy (parser_t *abstract)
+{
+	if (! parser_is_cressi_edy (abstract))
+		return PARSER_STATUS_TYPE_MISMATCH;
+
+	// Free memory.
+	free (abstract);
+
+	return PARSER_STATUS_SUCCESS;
+}
+
+
+static parser_status_t
+cressi_edy_parser_set_data (parser_t *abstract, const unsigned char *data, unsigned int size)
+{
+	if (! parser_is_cressi_edy (abstract))
+		return PARSER_STATUS_TYPE_MISMATCH;
+
+	return PARSER_STATUS_SUCCESS;
+}
+
+
+static parser_status_t
+cressi_edy_parser_get_datetime (parser_t *abstract, dc_datetime_t *datetime)
+{
+	if (abstract->size < 32)
+		return PARSER_STATUS_ERROR;
+
+	const unsigned char *p = abstract->data;
+
+	if (datetime) {
+		datetime->year = bcd2dec (p[4]) + 2000;
+		datetime->month = (p[5] & 0xF0) >> 4;
+		datetime->day = (p[5] & 0x0F) * 10 + ((p[6] & 0xF0) >> 4);
+		datetime->hour = bcd2dec (p[14]);
+		datetime->minute = bcd2dec (p[15]);
+		datetime->second = 0;
+	}
+
+	return PARSER_STATUS_SUCCESS;
+}
+
+
+static parser_status_t
+cressi_edy_parser_samples_foreach (parser_t *abstract, sample_callback_t callback, void *userdata)
+{
+	const unsigned char *data = abstract->data;
+	unsigned int size = abstract->size;
+
+	unsigned int time = 0;
+	unsigned int interval = 1;
+
+	unsigned int offset = 32;
+	while (offset + 2 <= size) {
+		parser_sample_value_t sample = {0};
+
+		if (data[offset] == 0xFF)
+			break;
+
+		// Time (seconds).
+		time += interval;
+		sample.time = time;
+		if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata);
+
+		// Depth (1/10 m).
+		unsigned int depth = bcd2dec (data[offset + 0]) * 100 + bcd2dec (data[offset + 1]);
+		sample.depth = depth / 10.0;
+		if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata);
+
+		offset += 2;
+	}
+
+	return PARSER_STATUS_SUCCESS;
+}
diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols
index ac66f6d..42c9b99 100644
--- a/src/libdivecomputer.symbols
+++ b/src/libdivecomputer.symbols
@@ -39,6 +39,7 @@ oceanic_vtpro_parser_create
 oceanic_veo250_parser_create
 oceanic_atom2_parser_create
 hw_ostc_parser_create
+cressi_edy_parser_create
 
 device_close
 device_dump
diff --git a/src/parser.h b/src/parser.h
index 888f689..f57234b 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -43,7 +43,8 @@ typedef enum parser_type_t {
 	PARSER_TYPE_OCEANIC_VTPRO,
 	PARSER_TYPE_OCEANIC_VEO250,
 	PARSER_TYPE_OCEANIC_ATOM2,
-	PARSER_TYPE_HW_OSTC
+	PARSER_TYPE_HW_OSTC,
+	PARSER_TYPE_CRESSI_EDY
 } parser_type_t;
 
 typedef enum parser_status_t {