diff --git a/src/Makefile.am b/src/Makefile.am
index 68e6fc17..325722a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -213,6 +213,7 @@ file_C			= filegen.c \
 			  file_ttf.c \
 			  file_txt.c \
 			  file_tz.c \
+			  file_vdi.c \
 			  file_veg.c \
 			  file_vfb.c \
 			  file_vmdk.c \
diff --git a/src/file_list.c b/src/file_list.c
index 4f8e8563..9582c549 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -215,6 +215,7 @@ extern const file_hint_t file_hint_tph;
 extern const file_hint_t file_hint_ttf;
 extern const file_hint_t file_hint_txt;
 extern const file_hint_t file_hint_tz;
+extern const file_hint_t file_hint_vdi;
 extern const file_hint_t file_hint_veg;
 extern const file_hint_t file_hint_vfb;
 extern const file_hint_t file_hint_vmdk;
@@ -425,6 +426,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_tz   },
   { .enable=0, .file_hint=&file_hint_vfb  },
   { .enable=0, .file_hint=&file_hint_vmdk },
+  { .enable=0, .file_hint=&file_hint_vdi  },
   { .enable=0, .file_hint=&file_hint_veg  },
   { .enable=0, .file_hint=&file_hint_wdp  },
   { .enable=0, .file_hint=&file_hint_win  },
diff --git a/src/file_vdi.c b/src/file_vdi.c
new file mode 100644
index 00000000..06ad4213
--- /dev/null
+++ b/src/file_vdi.c
@@ -0,0 +1,106 @@
+/*
+
+    File: file_vdi.c
+
+    Copyright (C) 2010 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"
+#include "common.h"
+
+static void register_header_check_vdi(file_stat_t *file_stat);
+static int header_check_vdi(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_vdi= {
+  .extension="vdi",
+  .description="Virtual desktop infrastructure 1.1",
+  .min_header_distance=0,
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_vdi
+};
+
+static const unsigned char vdi_header[4]= {0x7f, 0x10, 0xda, 0xbe};
+
+static void register_header_check_vdi(file_stat_t *file_stat)
+{
+  register_header_check(0x40, vdi_header,sizeof(vdi_header), &header_check_vdi, file_stat);
+}
+
+/* Image version. */
+#define VDI_VERSION_1_1 0x00010001
+
+/* Image type. */
+#define VDI_TYPE_DYNAMIC 1
+#define VDI_TYPE_STATIC  2
+
+typedef unsigned char uuid_t[16];
+
+typedef struct {
+    char text[0x40];
+    uint32_t signature;
+    uint32_t version;
+    uint32_t header_size;
+    uint32_t image_type;
+    uint32_t image_flags;
+    char description[256];
+    uint32_t offset_bmap;
+    uint32_t offset_data;
+    uint32_t cylinders;         /* disk geometry, unused here */
+    uint32_t heads;             /* disk geometry, unused here */
+    uint32_t sectors;           /* disk geometry, unused here */
+    uint32_t sector_size;
+    uint32_t unused1;
+    uint64_t disk_size;
+    uint32_t block_size;
+    uint32_t block_extra;       /* unused here */
+    uint32_t blocks_in_image;
+    uint32_t blocks_allocated;
+    uuid_t uuid_image;
+    uuid_t uuid_last_snap;
+    uuid_t uuid_link;
+    uuid_t uuid_parent;
+    uint64_t unused2[7];
+} VdiHeader;
+
+static int header_check_vdi(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 VdiHeader *header=(const VdiHeader *)buffer;
+  if(memcmp(&buffer[0x40], vdi_header, sizeof(vdi_header))==0 && le32(header->version) == VDI_VERSION_1_1)
+  {
+    reset_file_recovery(file_recovery_new);
+    file_recovery_new->extension=file_hint_vdi.extension;
+    if(le32(header->image_type) == VDI_TYPE_STATIC)
+    {
+      file_recovery_new->calculated_file_size=(uint64_t) le32(header->offset_data) + le32(header->blocks_in_image) * le32(header->block_size);
+      file_recovery_new->data_check=&data_check_size;
+      file_recovery_new->file_check=&file_check_size;
+    }
+    return 1;
+  }
+  return 0;
+}