diff --git a/scripts/get_os.sh b/scripts/get_os.sh
index 61073298..5d85973a 100644
--- a/scripts/get_os.sh
+++ b/scripts/get_os.sh
@@ -40,6 +40,7 @@ usage()
 # --- here we go
 
 myname=`basename $0`
+release_file=/etc/os-release
 
 set -- `getopt 'hv' $*`
 while [ "$1" != -- ] ; do
@@ -58,18 +59,28 @@ shift
 done
 shift
 
-if [ -f /etc/SuSE-release ]; then
+if [ -r /etc/os-release ]; then
+	. /etc/os-release
+	if [ "$opt_verbose" ]; then
+		echo $NAME $VERSION
+	else
+		echo $ID-$VERSION_ID | sed 's/opensuse/suse/g'
+	fi
+	exit
+fi
+
+if [ -e /etc/SuSE-release ]; then
 	if [ "$opt_verbose" ]; then
 		head -1 /etc/SuSE-release
 	else
 		VERSION="`grep VERSION /etc/SuSE-release | sed -e 's/.*=//; s/ //g'`"
 		echo suse-$VERSION
 	fi
-else
-	if [ "$opt_verbose" ]; then
-		uname -a
-	else
-		uname -r
-	fi
+	exit
 fi
 
+if [ "$opt_verbose" ]; then
+	uname -a
+else
+	uname -r
+fi