diff --git a/src/Makefile.am b/src/Makefile.am
index 5034063b..7ad2586b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -122,6 +122,7 @@ file_C			= filegen.c \
 			  file_lnk.c \
 			  file_logic.c \
 			  file_m2ts.c \
+			  file_mat.c \
 			  file_max.c \
 			  file_mb.c \
 			  file_mcd.c \
diff --git a/src/file_list.c b/src/file_list.c
index d1354453..611e08af 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -125,6 +125,7 @@ extern const file_hint_t file_hint_ldf;
 extern const file_hint_t file_hint_logic;
 extern const file_hint_t file_hint_lnk;
 extern const file_hint_t file_hint_m2ts;
+extern const file_hint_t file_hint_mat;
 extern const file_hint_t file_hint_max;
 extern const file_hint_t file_hint_mb;
 extern const file_hint_t file_hint_mcd;
@@ -317,6 +318,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_logic},
   { .enable=0, .file_hint=&file_hint_lnk  },
   { .enable=0, .file_hint=&file_hint_m2ts },
+  { .enable=0, .file_hint=&file_hint_mat  },
   { .enable=0, .file_hint=&file_hint_max  },
   { .enable=0, .file_hint=&file_hint_mb   },
   { .enable=0, .file_hint=&file_hint_mcd  },
diff --git a/src/file_mat.c b/src/file_mat.c
new file mode 100644
index 00000000..70dc174f
--- /dev/null
+++ b/src/file_mat.c
@@ -0,0 +1,66 @@
+/*
+
+    File: file_mat.c
+
+    Copyright (C) 2009 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_mat(file_stat_t *file_stat);
+static int header_check_mat(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);
+
+const file_hint_t file_hint_mat= {
+  .extension="mat",
+  .description="Mathlab",
+  .min_header_distance=0,
+  .max_filesize=10*1024*1024,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_mat
+};
+
+static const unsigned char mat_header[7]= {'M', 'A', 'T', 'L', 'A', 'B', ' '};
+
+static void register_header_check_mat(file_stat_t *file_stat)
+{
+  register_header_check(0, mat_header,sizeof(mat_header), &header_check_mat, file_stat);
+}
+
+static int header_check_mat(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)
+{
+  const unsigned char mat_le[4]={0x00, 0x01, 'I', 'M'};
+  const unsigned char mat_be[4]={0x01, 0x00, 'M', 'I'};
+  if(memcmp(buffer,mat_header,sizeof(mat_header))==0 &&
+    (memcmp(&buffer[0x7c], mat_le, sizeof(mat_le))==0 ||
+     memcmp(&buffer[0x7c], mat_be, sizeof(mat_be))==0))
+  {
+    reset_file_recovery(file_recovery_new);
+    file_recovery_new->extension=file_hint_mat.extension;
+    return 1;
+  }
+  return 0;
+}