diff --git a/AUTHORS b/AUTHORS
index 1c04199ff4..40c497d116 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -59,3 +59,9 @@ Saggi Mizrahi -
 
 Alfred Agrell - <floating@muncher.se>
    - Rewritten savestate manager
+   
+Jean-André Santoni - <jean.andre.santoni@gmail.com>
+   - Lakka menu driver
+
+Morgane Alonso -
+   - Lakka menu driver (graphic design)
diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c
index 04f3019a25..fc51f3806e 100644
--- a/frontend/menu/backend/menu_lakka_backend.c
+++ b/frontend/menu/backend/menu_lakka_backend.c
@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2014      - 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-
@@ -91,8 +92,10 @@ static int menu_lakka_iterate(void *data, unsigned action)
          break;
 
       case RGUI_ACTION_OK:
-         if (depth == 1) {
-            switch (categories[menu_active_category].items[categories[menu_active_category].active_item].active_subitem) {
+         if (depth == 1)
+         {
+            switch (categories[menu_active_category].items[categories[menu_active_category].active_item].active_subitem)
+            {
                case 0:
                   if (g_extern.main_is_init && !g_extern.libretro_dummy && strcmp(g_extern.fullpath, categories[menu_active_category].items[categories[menu_active_category].active_item].rom) == 0)
                   {
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index 28c4ce7f36..8aec40f9e8 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -2,6 +2,7 @@
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2014 - Daniel De Matteis
  *  Copyright (C) 2012-2014 - Michael Lelli
+ *  Copyright (C) 2014      - 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-
@@ -898,7 +899,7 @@ static void *lakka_init(void)
 
    menu_init_core_info(rgui);
 
-   rgui->core_info = core_info_list_new("/usr/lib/libretro");
+   rgui->core_info = core_info_list_new(*rgui->libretro_dir ? rgui->libretro_dir : "/usr/lib/libretro");
 
    num_categories = rgui->core_info ? rgui->core_info->count + 1 : 1;