diff --git a/src/Makefile.am b/src/Makefile.am
index f49f2aed..a7c2a2b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -122,6 +122,7 @@ file_C			= filegen.c \
 			  file_evt.c \
 			  file_evtx.c \
 			  file_exe.c \
+			  file_exr.c \
 			  file_exs.c \
 			  file_ext.c \
 			  file_ext2.c \
diff --git a/src/file_exr.c b/src/file_exr.c
new file mode 100644
index 00000000..f0df6ba7
--- /dev/null
+++ b/src/file_exr.c
@@ -0,0 +1,58 @@
+/*
+
+    File: file_exr.c
+
+    Copyright (C) 2019 Christophe GRENIER <grenier@cgsecurity.org>
+
+    This software is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write the Free Software Foundation, Inc., 51
+    Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <stdio.h>
+#include "types.h"
+#include "filegen.h"
+
+static void register_header_check_exr(file_stat_t *file_stat);
+
+const file_hint_t file_hint_exr= {
+  .extension="exr",
+  .description="OpenEXR",
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_exr
+};
+
+/* https://www.openexr.com/documentation/openexrfilelayout.pdf */
+static int header_check_exr(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
+{
+  reset_file_recovery(file_recovery_new);
+  file_recovery_new->extension=file_hint_exr.extension;
+  file_recovery_new->min_filesize=0x20;
+  return 1;
+}
+
+static void register_header_check_exr(file_stat_t *file_stat)
+{
+  /* OpenEXR v2 */
+  static const unsigned char exr_header[5]=  { 'v' , 0x2f, '1' , 0x01, 0x02  };
+  register_header_check(0, exr_header, sizeof(exr_header), &header_check_exr, file_stat);
+}
diff --git a/src/file_list.c b/src/file_list.c
index 0cbad05b..f706680d 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -123,6 +123,7 @@ extern const file_hint_t file_hint_ess;
 extern const file_hint_t file_hint_evt;
 extern const file_hint_t file_hint_evtx;
 extern const file_hint_t file_hint_exe;
+extern const file_hint_t file_hint_exr;
 extern const file_hint_t file_hint_exs;
 extern const file_hint_t file_hint_ext2_sb;
 extern const file_hint_t file_hint_ext2_fs;
@@ -461,6 +462,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_evt  },
   { .enable=0, .file_hint=&file_hint_evtx  },
   { .enable=0, .file_hint=&file_hint_exe  },
+  { .enable=0, .file_hint=&file_hint_exr  },
   { .enable=0, .file_hint=&file_hint_exs  },
   { .enable=0, .file_hint=&file_hint_ext2_sb },
   { .enable=0, .file_hint=&file_hint_ext2_fs },