diff --git a/src/Makefile.am b/src/Makefile.am
index 50ee7060..ef0839c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,6 +162,7 @@ file_C			= filegen.c \
 			  file_jsonlz4.c \
 			  file_kdb.c \
 			  file_kdbx.c \
+			  file_key.c \
 			  file_ldf.c \
 			  file_lit.c \
 			  file_lnk.c \
diff --git a/src/file_key.c b/src/file_key.c
new file mode 100644
index 00000000..8a396a96
--- /dev/null
+++ b/src/file_key.c
@@ -0,0 +1,57 @@
+/*
+
+    File: file_key.c
+
+    Copyright (C) 2015 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_key(file_stat_t *file_stat);
+
+const file_hint_t file_hint_key= {
+  .extension="key",
+  .description="Synology AES key",
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_key
+};
+
+static int header_check_key(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_key.extension;
+  file_recovery_new->calculated_file_size=32;
+  file_recovery_new->data_check=&data_check_size;
+  file_recovery_new->file_check=&file_check_size;
+  return 1;
+}
+
+static void register_header_check_key(file_stat_t *file_stat)
+{
+  register_header_check(0, "323382b3c4f1c6d2", 16, &header_check_key, file_stat);
+}
diff --git a/src/file_list.c b/src/file_list.c
index 8ec935ca..c3a3dc54 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -164,6 +164,7 @@ extern const file_hint_t file_hint_jpg;
 extern const file_hint_t file_hint_jsonlz4;
 extern const file_hint_t file_hint_kdb;
 extern const file_hint_t file_hint_kdbx;
+extern const file_hint_t file_hint_key;
 extern const file_hint_t file_hint_ldf;
 extern const file_hint_t file_hint_lit;
 extern const file_hint_t file_hint_logic;
@@ -455,6 +456,7 @@ file_enable_t list_file_enable[]=
   { .enable=0, .file_hint=&file_hint_jsonlz4  },
   { .enable=0, .file_hint=&file_hint_kdb  },
   { .enable=0, .file_hint=&file_hint_kdbx },
+  { .enable=0, .file_hint=&file_hint_key  },
   { .enable=0, .file_hint=&file_hint_ldf  },
   { .enable=0, .file_hint=&file_hint_lit  },
   { .enable=0, .file_hint=&file_hint_logic},