diff --git a/src/Makefile.am b/src/Makefile.am
index 7dc842dc..8dd1b0d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -266,6 +266,7 @@ file_C			= filegen.c \
 			  file_vmdk.c \
 			  file_vmg.c \
 			  file_wdp.c \
+			  file_wim.c \
 			  file_win.c \
 			  file_wks.c \
 			  file_wmf.c \
diff --git a/src/file_list.c b/src/file_list.c
index d33bad9a..18c65988 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -269,6 +269,7 @@ extern const file_hint_t file_hint_vfb;
 extern const file_hint_t file_hint_vmdk;
 extern const file_hint_t file_hint_vmg;
 extern const file_hint_t file_hint_wdp;
+extern const file_hint_t file_hint_wim;
 extern const file_hint_t file_hint_win;
 extern const file_hint_t file_hint_wks;
 extern const file_hint_t file_hint_wmf;
@@ -531,6 +532,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_vmdk },
   { .enable=0, .file_hint=&file_hint_vmg  },
   { .enable=0, .file_hint=&file_hint_wdp  },
+  { .enable=0, .file_hint=&file_hint_wim  },
   { .enable=0, .file_hint=&file_hint_win  },
   { .enable=0, .file_hint=&file_hint_wks  },
   { .enable=0, .file_hint=&file_hint_wmf  },
diff --git a/src/file_wim.c b/src/file_wim.c
new file mode 100644
index 00000000..978d48a1
--- /dev/null
+++ b/src/file_wim.c
@@ -0,0 +1,55 @@
+/*
+
+    File: file_wim.c
+
+    Copyright (C) 2012 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_wim(file_stat_t *file_stat);
+
+const file_hint_t file_hint_wim= {
+  .extension="wim",
+  .description="Windows imaging (WIM) image",
+  .min_header_distance=0,
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_wim
+};
+
+static int header_check_wim(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_wim.extension;
+  return 1;
+}
+
+static void register_header_check_wim(file_stat_t *file_stat)
+{
+  register_header_check(0, "MSWIM\0\0\0", 8, &header_check_wim, file_stat);
+}