diff --git a/releng/manual_devices b/releng/manual_devices
index b5b35139..13e6ef2d 100755
--- a/releng/manual_devices
+++ b/releng/manual_devices
@@ -65,6 +65,14 @@ done
 # Insist in having a xorriso 
 check_for_xorriso -x
 
+has_device_links=$("$RELENG_XORRISO" -help 2>/dev/null | fgrep ' -device_links')
+if test -n "$has_device_links"
+then
+  devices_opt="-device_links"
+else
+  devices_opt="-devices"
+fi
+
 #
 get_speeds() {
   echo -e "\n${SELF}: Running:   ${RELENG_XORRISO} -report_about WARNING -outdev ${1} -toc -list_formats -list_profiles out -list_speeds"
@@ -83,14 +91,14 @@ $1
 }
 
 get_devices() {
-  # $1 = if not empty: device lines from xorriso -devices
+  # $1 = if not empty: device lines from xorriso -devices or -device_links
   # $2 = if not empty: suppress dialog and use $2 as input
 
   if test -n "$1"
   then
        DEVICES="$1"
   else
-       DEVICES=$("$RELENG_XORRISO" -devices 2>/dev/null | grep "\-dev")
+       DEVICES=$("$RELENG_XORRISO" $devices_opt 2>/dev/null | grep "\-dev")
   fi
   NUM_DEV=$(cat_var "$DEVICES" | wc -l)
   case "${NUM_DEV}" in
@@ -133,8 +141,8 @@ get_devices() {
 
 # main
 "$RELENG_XORRISO"  -version
-echo -e "\n${SELF}: Running: $RELENG_XORRISO -devices..."
-devices=$("$RELENG_XORRISO" -report_about WARNING -devices | grep "\-dev")
+echo -e "\n${SELF}: Running: $RELENG_XORRISO $devices_opt ..."
+devices=$("$RELENG_XORRISO" -report_about WARNING $devices_opt | grep "\-dev")
 RET="$?"
 if test "$SIMULATE_FAILURE" = 1
 then
@@ -157,7 +165,7 @@ case ${RET} in
      ;;
      *)
       boldify
-      echo -ne "\n${SELF}: ${RELENG_XORRISO} -devices returned ${RET}."
+      echo -ne "\n${SELF}: ${RELENG_XORRISO} $devices_opt returned ${RET}."
       unboldify
       echo -e  "\n${SELF}: Already mounted?"
       df -kh