diff --git a/Makefile.common b/Makefile.common
index e3e3d219ae..f1e460b8ab 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1110,7 +1110,8 @@ ifeq ($(HAVE_NETWORKING), 1)
 			 network/net_http_special.o \
 			 tasks/task_http.o \
 			 tasks/task_netplay_lan_scan.o \
-			 tasks/task_wifi.o
+			 tasks/task_wifi.o \
+			 tasks/task_netplay_crc.o
 
    ifneq ($(HAVE_SOCKET_LEGACY),1)
    OBJ += $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 041d9b92c9..d4954defa8 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -900,6 +900,7 @@ NETPLAY
 #include "../tasks/task_http.c"
 #include "../tasks/task_netplay_lan_scan.c"
 #include "../tasks/task_wifi.c"
+#include "../tasks/task_netplay_crc.c"
 #endif
 
 /*============================================================
diff --git a/tasks/task_netplay_crc.c b/tasks/task_netplay_crc.c
new file mode 100644
index 0000000000..7e49775768
--- /dev/null
+++ b/tasks/task_netplay_crc.c
@@ -0,0 +1,136 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2016 - Jean-André Santoni
+ *
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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 RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <errno.h>
+#include <file/nbio.h>
+#include <formats/image.h>
+#include <compat/strl.h>
+#include <retro_assert.h>
+#include <retro_miscellaneous.h>
+#include <lists/string_list.h>
+#include <rhash.h>
+#include <string/stdstring.h>
+#include <file/file_path.h>
+#include <lists/dir_list.h>
+
+#include "tasks_internal.h"
+#include "../file_path_special.h"
+#include "../verbosity.h"
+#include "../configuration.h"
+#include "../playlist.h"
+
+typedef struct
+{
+   struct string_list *lpl_list;
+   char crc[PATH_MAX_LENGTH];
+} netplay_crc_handle_t;
+
+static void netplay_crc_scan_callback(void *task_data,
+                               void *user_data, const char *error)
+{
+   printf("CALLBACK\n");
+}
+
+static void task_netplay_crc_scan_handler(retro_task_t *task)
+{
+   netplay_crc_handle_t *state = (netplay_crc_handle_t*)task->state;
+   size_t i, j;
+
+   task_set_progress(task, 0);
+   task_set_title(task, "Checking for ROM presence.");
+   task_set_finished(task, false);
+
+   if (!state->lpl_list)
+   {
+      task_set_progress(task, 100);
+      task_set_title(task, "Playlist directory not found.");
+      task_set_finished(task, true);
+      return;
+   }
+
+   if (state->lpl_list->size == 0)
+      goto no_playlists;
+
+   for (i = 0; i < state->lpl_list->size; i++)
+   {
+      const char *lpl_path = state->lpl_list->elems[i].data;
+
+      if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
+         continue;
+
+      printf("%s\n", lpl_path);
+
+      playlist_t *playlist = playlist_init(lpl_path, 99999);
+
+      for (j = 0; j < playlist->size; j++)
+      {
+         printf("%s\n", playlist->entries[j].crc32);
+         if (string_is_equal(playlist->entries[j].crc32, "6BE4CA95|crc"))
+         {
+            task_set_progress(task, 100);
+            task_set_title(task, "Game found.");
+            task_set_finished(task, true);
+            string_list_free(state->lpl_list);
+            return;
+         }
+
+         task_set_progress(task, (int)(j/playlist->size*100.0));
+      }
+   }
+
+no_playlists:
+   string_list_free(state->lpl_list);
+   task_set_progress(task, 100);
+   task_set_title(task, "No game found.");
+   task_set_finished(task, true);
+   return;
+}
+
+bool task_push_netplay_crc_scan(uint32_t crc)
+{
+   settings_t *settings = config_get_ptr();
+   retro_task_t   *task = (retro_task_t *)calloc(1, sizeof(*task));
+   netplay_crc_handle_t *state = (netplay_crc_handle_t*)calloc(1, sizeof(*state));
+
+   if (!task || !state)
+      goto error;
+
+   state->crc[0] = '\0';
+   snprintf(state->crc, sizeof(state->crc), "%08X|crc", crc);
+
+   state->lpl_list = dir_list_new(settings->directory.playlist,
+         NULL, true, true, true, false);
+
+   /* blocking means no other task can run while this one is running, 
+    * which is the default */
+   task->type           = TASK_TYPE_BLOCKING;
+   task->state          = state;
+   task->handler        = task_netplay_crc_scan_handler;
+   task->callback       = netplay_crc_scan_callback;
+   task->title          = strdup("Checking for ROM presence.");
+
+   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+
+   return true;
+
+error:
+   if (state)
+      free(state);
+   if (task)
+      free(task);
+
+   return false;
+}
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 0d50899867..51bbfea46f 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -98,6 +98,8 @@ bool task_push_wifi_scan(void);
 
 bool task_push_netplay_lan_scan(void);
 
+bool task_push_netplay_crc_scan(uint32_t crc);
+
 #endif
 
 bool task_push_image_load(const char *fullpath,