diff --git a/data/glest_game b/data/glest_game
index a0a41b23c..d26aac665 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit a0a41b23c9e4bcb5b1c4ac5be599519e1daba075
+Subproject commit d26aac665e773a5861fa2d080a78454cf849f27a
diff --git a/mk/linux/mg_shared.sh b/mk/linux/mg_shared.sh
index 8c94dcb85..d08d1d8c7 100755
--- a/mk/linux/mg_shared.sh
+++ b/mk/linux/mg_shared.sh
@@ -20,32 +20,35 @@ function detect_system {
 
 	if [ "$(which lsb_release)" = "" ]; then
 		lsb=0
-		if [ -e /etc/debian_version ]; then
+		release='unknown release'
+		if [ -e "/etc/os-release" ]; then
+			distribution="$(cat "/etc/os-release" | grep '^ID=' | awk -F '=' '{print $2}' \
+			    | awk '{print toupper(substr($0,1,1))substr($0,2)}')"
+			codename="$(cat "/etc/os-release" | grep '^PRETTY_NAME=' | awk -F '"' '{print $2}')"
+			# example output ^ on debian testing: "Debian GNU/Linux stretch/sid"
+		elif [ -e /etc/debian_version ]; then
 			distribution='Debian'
-			release='unknown release version'
 			codename="$(cat /etc/debian_version)"
 		elif [ -e /etc/SuSE-release ]; then
 			distribution='SuSE'
-			release='unknown release version'
 			codename="$(cat /etc/SuSE-release)"
 		elif [ -e /etc/redhat-release ]; then
 			if [ -e /etc/fedora-release ]; then
 				distribution='Fedora'
-				release='unknown release version'
 				codename="$(cat /etc/fedora-release)"
 			else
 				distribution='Redhat'
-				release='unknown release version'
 				codename="$(cat /etc/redhat-release)"
 			fi
 		elif [ -e /etc/fedora-release ]; then
 			distribution='Fedora'
-			release='unknown release version'
 			codename="$(cat /etc/fedora-release)"
 		elif [ -e /etc/mandrake-release ]; then
 			distribution='Mandrake'
-			release='unknown release version'
 			codename="$(cat /etc/mandrake-release)"
+		else
+			distribution='unknown distribution'
+			codename='unknown codename'
 		fi
 	else
 		lsb=1
diff --git a/mk/linux/start_megaglest b/mk/linux/start_megaglest
index 8e19caa01..b20a5f43c 100755
--- a/mk/linux/start_megaglest
+++ b/mk/linux/start_megaglest
@@ -29,6 +29,8 @@ BeginTime="$(date +"%s")"
 WhichLsbRelease="$(which lsb_release 2>/dev/null)"
 if [ "$WhichLsbRelease" != "" ]; then
     OS_INFO="$($WhichLsbRelease -d | awk -F ':[ \t]*' '{print $2}')"
+elif [ -e "/etc/os-release" ]; then
+    OS_INFO="$(cat "/etc/os-release" | grep '^PRETTY_NAME=' | awk -F '"' '{print $2}')"
 fi
 
 if [ "$OperatingMode" != "--tool-buginfo" ]; then
diff --git a/source/tools/support/linux/system_report b/source/tools/support/linux/system_report
index 78082387d..ca7811556 100755
--- a/source/tools/support/linux/system_report
+++ b/source/tools/support/linux/system_report
@@ -8,7 +8,7 @@
 # -----------------------------------------------------------------------------
 #
 # Written by Tom Reynolds <tomreyn[at]megaglest.org>
-# Copyright (c) 2012 Tom Reynolds, The MegaGlest Team, under GNU GPL v3.0
+# Copyright (c) 2012-2016 Tom Reynolds, The MegaGlest Team, under GNU GPL v3.0
 #
 # -----------------------------------------------------------------------------
 #
@@ -227,11 +227,19 @@ echo '' >> $REPORT_LOCATION
 if [ `which lsb_release`'x' = 'x' ]
 then # no lsb_release in path
 	lsb=0
-	if [ -e /etc/debian_version ];   then distribution='Debian';   release='unknown release version'; codename=`cat /etc/debian_version`;   fi
-	if [ -e /etc/SuSE-release ];     then distribution='SuSE';     release='unknown release version'; codename=`cat /etc/SuSE-release`;     fi
-	if [ -e /etc/fedora-release ];   then distribution='Fedora';   release='unknown release version'; codename=`cat /etc/fedora-release`;   fi
-	if [ -e /etc/redhat-release ];   then distribution='Redhat';   release='unknown release version'; codename=`cat /etc/redhat-release`;   fi
-	if [ -e /etc/mandrake-release ]; then distribution='Mandrake'; release='unknown release version'; codename=`cat /etc/mandrake-release`; fi
+	release='unknown release'
+	if [ -e "/etc/os-release" ]; then
+		distribution="$(cat "/etc/os-release" | grep '^ID=' | awk -F '=' '{print $2}' \
+			    | awk '{print toupper(substr($0,1,1))substr($0,2)}')"
+		codename="$(cat "/etc/os-release" | grep '^PRETTY_NAME=' | awk -F '"' '{print $2}')"
+	elif [ -e /etc/debian_version ]; then distribution='Debian'; codename="$(cat /etc/debian_version)"
+	elif [ -e /etc/SuSE-release ]; then distribution='SuSE'; codename="$(cat /etc/SuSE-release)"
+	elif [ -e /etc/redhat-release ]; then
+		if [ -e /etc/fedora-release ]; then distribution='Fedora'; codename="$(cat /etc/fedora-release)"
+		else distribution='Redhat'; codename="$(cat /etc/redhat-release)"; fi
+	elif [ -e /etc/fedora-release ]; then distribution='Fedora'; codename="$(cat /etc/fedora-release)"
+	elif [ -e /etc/mandrake-release ]; then distribution='Mandrake'; codename="$(cat /etc/mandrake-release)"
+	else distribution='unknown distribution'; codename='unknown codename'; fi
 else
 	lsb=1
 	distribution=`lsb_release -i | awk -F':' '{ gsub(/^[ \t]*/,"",$2); print $2 }'`