diff --git a/src/Makefile.am b/src/Makefile.am
index 6b19af0d..0dbe9b8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -216,6 +216,7 @@ file_C			= filegen.c \
 			  file_tax.c \
 			  file_tib.c \
 			  file_tiff.c \
+			  file_torrent.c \
 			  file_tph.c \
 			  file_ttf.c \
 			  file_txt.c \
diff --git a/src/file_list.c b/src/file_list.c
index 69257c67..b289e658 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -218,6 +218,7 @@ extern const file_hint_t file_hint_tar;
 extern const file_hint_t file_hint_tax;
 extern const file_hint_t file_hint_tib;
 extern const file_hint_t file_hint_tiff;
+extern const file_hint_t file_hint_torrent;
 extern const file_hint_t file_hint_tph;
 extern const file_hint_t file_hint_ttf;
 extern const file_hint_t file_hint_txt;
@@ -433,6 +434,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_tax  },
   { .enable=0, .file_hint=&file_hint_tib  },
   { .enable=0, .file_hint=&file_hint_tiff },
+  { .enable=0, .file_hint=&file_hint_torrent  },
   { .enable=0, .file_hint=&file_hint_tph  },
   { .enable=0, .file_hint=&file_hint_ttf  },
   { .enable=0, .file_hint=&file_hint_fasttxt  },
diff --git a/src/file_torrent.c b/src/file_torrent.c
new file mode 100644
index 00000000..99c1ea09
--- /dev/null
+++ b/src/file_torrent.c
@@ -0,0 +1,66 @@
+/*
+
+    File: file_torrent.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"
+
+static void register_header_check_torrent(file_stat_t *file_stat);
+static int header_check_torrent(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_torrent= {
+  .extension="torrent",
+  .description="Torrent",
+  .min_header_distance=0,
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_torrent
+};
+
+static const unsigned char torrent_header[11]=  {
+  'd' , '8' , ':', 'a' , 'n' , 'n' , 'o' , 'u' ,
+  'n' , 'c' , 'e' 
+};
+
+static void register_header_check_torrent(file_stat_t *file_stat)
+{
+  register_header_check(0, torrent_header, sizeof(torrent_header), &header_check_torrent, file_stat);
+}
+
+static int header_check_torrent(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)
+{
+  if(memcmp(&buffer[0], torrent_header, sizeof(torrent_header))==0)
+  {
+    reset_file_recovery(file_recovery_new);
+    file_recovery_new->extension=file_hint_torrent.extension;
+    return 1;
+  }
+  return 0;
+}
+