diff --git a/database_info.c b/database_info.c
index f90c5207b3..31c99a9247 100644
--- a/database_info.c
+++ b/database_info.c
@@ -90,6 +90,8 @@ database_info_list_t *database_info_list_new(const char *rdb_path, const char *q
       db_info->max_users              = 0;
       db_info->releasemonth           = 0;
       db_info->releaseyear            = 0;
+      db_info->analog_supported       = 0;
+      db_info->rumble_supported       = 0;
 
       for (j = 0; j < item.map.len; j++)
       {
@@ -143,6 +145,12 @@ database_info_list_t *database_info_list_new(const char *rdb_path, const char *q
 
          if (!strcmp(key->string.buff, "releaseyear"))
             db_info->releaseyear = val->uint_;
+
+         if (!strcmp(key->string.buff, "rumble"))
+            db_info->rumble_supported = val->uint_;
+
+         if (!strcmp(key->string.buff, "analog"))
+            db_info->analog_supported = val->uint_;
       }
 i++;
    }
diff --git a/database_info.h b/database_info.h
index 1b41672032..c5317dbb08 100644
--- a/database_info.h
+++ b/database_info.h
@@ -43,6 +43,8 @@ typedef struct
    unsigned max_users;
    unsigned releasemonth;
    unsigned releaseyear;
+   unsigned analog_supported;
+   unsigned rumble_supported;
    void *userdata;
 } database_info_t;
 
diff --git a/menu/menu_database.c b/menu/menu_database.c
index 650eb1eed9..2e59dd1ed0 100644
--- a/menu/menu_database.c
+++ b/menu/menu_database.c
@@ -90,6 +90,8 @@ int menu_database_print_info(const char *path,
          RARCH_LOG("PEGI Rating: %s\n", db_info_entry->pegi_rating);
       if (db_info_entry->cero_rating)
          RARCH_LOG("CERO Rating: %s\n", db_info_entry->cero_rating);
+      RARCH_LOG("Analog supported: %s\n", db_info_entry->analog_supported ? "true" : "false");
+      RARCH_LOG("Rumble supported: %s\n", db_info_entry->rumble_supported ? "true" : "false");
       RARCH_LOG("\n\n");
    }