diff --git a/libsrc/atari/joy_stat_stddrv.s b/libsrc/atari/joy_stat_stddrv.s
index cbaf344d0..4528aa20d 100644
--- a/libsrc/atari/joy_stat_stddrv.s
+++ b/libsrc/atari/joy_stat_stddrv.s
@@ -7,8 +7,16 @@
 ;
 
         .export _joy_static_stddrv
+        .ifdef  __ATARIXL__
+        .import _atrxstd_joy
+        .else
         .import _atrstd_joy
+        .endif
 
 .rodata
 
+        .ifdef  __ATARIXL__
+_joy_static_stddrv := _atrxstd_joy
+        .else
 _joy_static_stddrv := _atrstd_joy
+        .endif
diff --git a/libsrc/atari/joy_stddrv.s b/libsrc/atari/joy_stddrv.s
index f3ab74e7b..e82dadb73 100644
--- a/libsrc/atari/joy_stddrv.s
+++ b/libsrc/atari/joy_stddrv.s
@@ -10,4 +10,9 @@
 
 .rodata
 
-_joy_stddrv:    .asciiz "atrstd.joy"
+_joy_stddrv:
+        .ifdef  __ATARIXL__
+                .asciiz "atrxstd.joy"
+        .else
+                .asciiz "atrstd.joy"
+        .endif
diff --git a/libsrc/atari/tgi_stat_stddrv.s b/libsrc/atari/tgi_stat_stddrv.s
index 5f1be70f8..dc3b7cc71 100644
--- a/libsrc/atari/tgi_stat_stddrv.s
+++ b/libsrc/atari/tgi_stat_stddrv.s
@@ -7,8 +7,16 @@
 ;
 
         .export _tgi_static_stddrv
+        .ifdef  __ATARIXL__
+        .import _atrx8_tgi
+        .else
         .import _atr8_tgi
+        .endif
 
 .rodata
 
+        .ifdef  __ATARIXL__
+_tgi_static_stddrv := _atrx8_tgi
+        .else
 _tgi_static_stddrv := _atr8_tgi
+        .endif
diff --git a/libsrc/atari/tgi_stddrv.s b/libsrc/atari/tgi_stddrv.s
index bec030511..e2f68a50e 100644
--- a/libsrc/atari/tgi_stddrv.s
+++ b/libsrc/atari/tgi_stddrv.s
@@ -10,4 +10,9 @@
 
 .rodata
 
-_tgi_stddrv:    .asciiz "atr8.tgi"
+_tgi_stddrv:
+        .ifdef  __ATARIXL__
+                .asciiz "atrx8.tgi"
+        .else
+                .asciiz "atr8.tgi"
+        .endif