diff --git a/dist/info/mame2000_libretro.info b/dist/info/mame2000_libretro.info
index 98a7ee2e..6dd1d9b9 100644
--- a/dist/info/mame2000_libretro.info
+++ b/dist/info/mame2000_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2000 (0.37b5)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-database = "MAME"
+database = "MAME 0.37b5"
 license = "MAME"
 permissions = ""
 display_version = "0.37b5"
diff --git a/dist/info/mame2003_libretro.info b/dist/info/mame2003_libretro.info
index 320f6dd3..4be594d7 100644
--- a/dist/info/mame2003_libretro.info
+++ b/dist/info/mame2003_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2003 (0.78)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-database = "MAME2003"
+database = "MAME 0.78"
 license = "MAME"
 permissions = ""
 display_version = "0.78"
diff --git a/dist/info/mame2003_midway_libretro.info b/dist/info/mame2003_midway_libretro.info
index a0f77c8d..e9d91a5e 100644
--- a/dist/info/mame2003_midway_libretro.info
+++ b/dist/info/mame2003_midway_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2003 Midway (0.78)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-database = "MAME2003"
+database = "MAME 0.78"
 license = "MAME"
 permissions = ""
 display_version = "0.78"
diff --git a/dist/info/mame2010_libretro.info b/dist/info/mame2010_libretro.info
index 08180be3..ba1c653d 100644
--- a/dist/info/mame2010_libretro.info
+++ b/dist/info/mame2010_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2010 (0.139)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-database = "MAME"
+database = "MAME 0.139"
 license = "MAME"
 permissions = ""
 display_version = "0.139"
diff --git a/dist/info/mame2014_libretro.info b/dist/info/mame2014_libretro.info
index b7e52681..fb69384d 100644
--- a/dist/info/mame2014_libretro.info
+++ b/dist/info/mame2014_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2014 (0.159)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-database = "MAME"
+database = "MAME 0.159"
 license = "MAME"
 permissions = ""
 display_version = "0.159"
diff --git a/dist/info/mame2016_libretro.info b/dist/info/mame2016_libretro.info
index d2a7e63c..983c9e70 100644
--- a/dist/info/mame2016_libretro.info
+++ b/dist/info/mame2016_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2016 (0.174)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-database = "MAME"
+database = "MAME 0.174"
 license = "MAME"
 permissions = ""
 display_version = "0.174"
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index c5a83919..784acd1c 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -170,6 +170,17 @@ build_libretro_database() {
 			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat"'
 		fi
 
+		#Check for the MAME folders
+		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/mame-nonmerged/${1}.dat" ]; then
+			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/mame-nonmerged/${1}.dat"'
+		fi
+		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/mame-split/${1}.dat" ]; then
+			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/mame-split/${1}.dat"'
+		fi
+		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/mame/${1}.dat" ]; then
+			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/mame/${1}.dat"'
+		fi
+
 		#Check if meta libretro-dats folder is there
 		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat" ]; then
 			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat"'
@@ -290,8 +301,12 @@ build_libretro_databases() {
 	build_libretro_database "VTech - CreatiVision" "rom.crc"
 	build_libretro_database "VTech - V.Smile" "rom.crc"
 	build_libretro_database "Watara - Supervision" "rom.crc"
-	build_libretro_database "MAME" "rom.name"
-	build_libretro_database "MAME2003" "rom.name"
+	build_libretro_database "MAME" "rom.crc"
+	build_libretro_database "MAME 0.37b5" "rom.crc"
+	build_libretro_database "MAME 0.78" "rom.crc"
+	build_libretro_database "MAME 0.139" "rom.crc"
+	build_libretro_database "MAME 0.159" "rom.crc"
+	build_libretro_database "MAME 0.174" "rom.crc"
 	build_libretro_database "FB Alpha - Arcade Games" "rom.name"
 	build_libretro_database "DOOM" "rom.crc"
 	build_libretro_database "Cave Story" "rom.crc"