diff --git a/src/Makefile.am b/src/Makefile.am
index f4b5c7b3..625ef21f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -338,6 +338,7 @@ file_C			= filegen.c \
 			  file_wtv.c \
 			  file_wv.c \
 			  file_x3f.c \
+			  file_x3i.c \
 			  file_x4a.c \
 			  file_xar.c \
 			  file_xcf.c \
diff --git a/src/file_list.c b/src/file_list.c
index a5fc2bfe..ef397927 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -341,6 +341,7 @@ extern const file_hint_t file_hint_wpd;
 extern const file_hint_t file_hint_wtv;
 extern const file_hint_t file_hint_wv;
 extern const file_hint_t file_hint_x3f;
+extern const file_hint_t file_hint_x3i;
 extern const file_hint_t file_hint_x4a;
 extern const file_hint_t file_hint_xar;
 extern const file_hint_t file_hint_xcf;
@@ -673,6 +674,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_wtv  },
   { .enable=0, .file_hint=&file_hint_wv   },
   { .enable=0, .file_hint=&file_hint_x3f  },
+  { .enable=0, .file_hint=&file_hint_x3i  },
   { .enable=0, .file_hint=&file_hint_x4a  },
   { .enable=0, .file_hint=&file_hint_xar  },
   { .enable=0, .file_hint=&file_hint_xcf  },
diff --git a/src/file_x3i.c b/src/file_x3i.c
new file mode 100644
index 00000000..b4b9b933
--- /dev/null
+++ b/src/file_x3i.c
@@ -0,0 +1,57 @@
+/*
+
+    File: file_x3i.c
+
+    Copyright (C) 2018 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_x3i(file_stat_t *file_stat);
+
+const file_hint_t file_hint_x3i= {
+  .extension="x3i",
+  .description="Sigma/Foveon X3 raw picture",
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_x3i
+};
+
+static int header_check_x3i(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_x3i.extension;
+  return 1;
+}
+
+static void register_header_check_x3i(file_stat_t *file_stat)
+{
+  static const unsigned char x3i_header[8]=  {
+    'F' , 'O' , 'V' , 'i' , 0x00, 0x00, 0x01, 0x00
+  };
+  register_header_check(0, x3i_header, sizeof(x3i_header), &header_check_x3i, file_stat);
+}