diff --git a/src/Makefile.am b/src/Makefile.am
index bba1e9a9..7d0850af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,6 +54,7 @@ file_C			= filegen.c \
 			  file_bmp.c \
 			  file_bz2.c \
 			  file_cab.c \
+			  file_caf.c \
 			  file_cam.c \
 			  file_cdt.c \
 			  file_chm.c \
diff --git a/src/file_caf.c b/src/file_caf.c
new file mode 100644
index 00000000..b2e18e52
--- /dev/null
+++ b/src/file_caf.c
@@ -0,0 +1,119 @@
+/*
+
+    File: file_caf.c
+
+    Copyright (C) 2011 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"
+//#define DEBUG_CAF
+#ifdef DEBUG_CAF
+#include "log.h"
+#endif
+
+static void register_header_check_caf(file_stat_t *file_stat);
+
+const file_hint_t file_hint_caf= {
+  .extension="caf",
+  .description="Core Audio Format",
+  .min_header_distance=0,
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_caf
+};
+
+/* http://developer.apple.com/library/mac/documentation/MusicAudio/Reference/CAFSpec/CAF_spec/CAF_spec.html */
+
+static const unsigned char caf_header[12]=  {
+  'c' , 'a' , 'f' , 'f' , 0x00, 0x01, 0x00, 0x00,
+  'd' , 'e' , 's' , 'c' 
+};
+
+struct chunk_struct
+{
+  uint32_t type;
+  int64_t  size;
+} __attribute__ ((__packed__));
+
+static int data_check_caf(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery)
+{
+  while(file_recovery->calculated_file_size + buffer_size/2  >= file_recovery->file_size &&
+      file_recovery->calculated_file_size + 12 < file_recovery->file_size + buffer_size/2)
+  {
+    const unsigned int i=file_recovery->calculated_file_size - file_recovery->file_size + buffer_size/2;
+    const struct chunk_struct *chunk=(const struct chunk_struct*)&buffer[i];
+    int64_t chunk_size=be64(chunk->size);
+#ifdef DEBUG_CAF
+    log_trace("file_caf.c: %s chunk %c%c%c%c (0x%02x%02x%02x%02x) size %llu, calculated_file_size %llu (0x%llx)\n",
+	file_recovery->filename,
+        buffer[i],buffer[i+1],buffer[i+2],buffer[i+3], 
+        buffer[i],buffer[i+1],buffer[i+2],buffer[i+3], 
+        (long long unsigned)chunk_size,
+        (long long unsigned)file_recovery->calculated_file_size,
+        (long long unsigned)file_recovery->calculated_file_size);
+#endif
+    if(buffer[i]==0)
+    {
+      file_recovery->calculated_file_size--;
+      return 2;
+    }
+    if(chunk_size >= 0)
+    {
+      file_recovery->calculated_file_size+=12+chunk_size;
+    }
+    else
+    {
+      file_recovery->data_check=NULL;
+      file_recovery->file_check=NULL;
+    }
+  }
+#ifdef DEBUG_CAF
+  log_trace("file_caf.c: new calculated_file_size %llu\n",
+      (long long unsigned)file_recovery->calculated_file_size);
+#endif
+  return 1;
+}
+
+static int header_check_caf(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], caf_header, sizeof(caf_header))==0)
+  {
+    reset_file_recovery(file_recovery_new);
+    file_recovery_new->extension=file_hint_caf.extension;
+    file_recovery_new->data_check=data_check_caf;
+    file_recovery_new->file_check=&file_check_size;
+    file_recovery_new->calculated_file_size=8;
+    return 1;
+  }
+  return 0;
+}
+
+static void register_header_check_caf(file_stat_t *file_stat)
+{
+  register_header_check(0, caf_header, sizeof(caf_header), &header_check_caf, file_stat);
+}
diff --git a/src/file_list.c b/src/file_list.c
index 54ac6642..39388d14 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -56,6 +56,7 @@ extern const file_hint_t file_hint_blend;
 extern const file_hint_t file_hint_bmp;
 extern const file_hint_t file_hint_bz2;
 extern const file_hint_t file_hint_cab;
+extern const file_hint_t file_hint_caf;
 extern const file_hint_t file_hint_cam;
 extern const file_hint_t file_hint_cdt;
 extern const file_hint_t file_hint_chm;
@@ -292,6 +293,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_bmp  },
   { .enable=0, .file_hint=&file_hint_bz2  },
   { .enable=0, .file_hint=&file_hint_cab  },
+  { .enable=0, .file_hint=&file_hint_caf  },
   { .enable=0, .file_hint=&file_hint_cam  },
   { .enable=0, .file_hint=&file_hint_cdt  },
   { .enable=0, .file_hint=&file_hint_chm  },