diff --git a/openssl/crypto/chacha/build.info b/openssl/crypto/chacha/build.info
index dadbe5ef5..703f98a04 100644
--- a/openssl/crypto/chacha/build.info
+++ b/openssl/crypto/chacha/build.info
@@ -15,7 +15,7 @@ IF[{- !$disabled{asm} -}]
   $CHACHAASM_loongarch64=chacha-loongarch64.S
 
   $CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s
-  IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" && $config{target} !~ /amiga/i -}]
+  IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" && $target{sys_id} ne "AMIGA" -}]
     $CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s chachap10-ppc.s
   ENDIF
   $CHACHAASM_ppc64=$CHACHAASM_ppc32
diff --git a/openssl/crypto/modes/build.info b/openssl/crypto/modes/build.info
index a9d3dfa26..c1525913f 100644
--- a/openssl/crypto/modes/build.info
+++ b/openssl/crypto/modes/build.info
@@ -35,7 +35,7 @@ IF[{- !$disabled{asm} -}]
   $MODESASM_ppc32=ghashp8-ppc.s
   $MODESDEF_ppc32=
   $MODESASM_ppc64=$MODESASM_ppc32
-  IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" && $config{target} !~ /amiga/i -}]
+  IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" && $target{sys_id} ne "AMIGA" -}]
     $MODESASM_ppc64=$MODESASM_ppc32 aes-gcm-ppc.s
   ENDIF
   $MODESDEF_ppc64=$MODESDEF_ppc32
diff --git a/openssl/fuzz/build.info b/openssl/fuzz/build.info
index acbf7287e..a42174792 100644
--- a/openssl/fuzz/build.info
+++ b/openssl/fuzz/build.info
@@ -108,16 +108,14 @@ ENDIF
 
 IF[{- !$disabled{tests} -}]
   PROGRAMS{noinst}=asn1-test asn1parse-test bignum-test bndiv-test client-test conf-test crl-test server-test smime-test
- IF[{- $config{target} !~ /amiga/ -}]
+ IF[{- $target{sys_id} ne "AMIGA" -}]
   PROGRAMS{noinst}=punycode-test
  ENDIF
   PROGRAMS{noinst}=pem-test decoder-test
   PROGRAMS{noinst}=v3name-test
 
-  IF[{- !$disabled{"cmp"} -}]
-   IF[{- $config{target} !~ /amiga/ -}]
+  IF[{- !$disabled{"cmp"} && $target{sys_id} ne "AMIGA" -}]
     PROGRAMS{noinst}=cmp-test
-   ENDIF
   ENDIF
 
   IF[{- !$disabled{"cms"} -}]
@@ -132,11 +130,9 @@ IF[{- !$disabled{tests} -}]
     PROGRAMS{noinst}=x509-test
   ENDIF
 
- IF[{- $config{target} !~ /amiga/ -}]
-  IF[{- !$disabled{"quic"} -}]
+  IF[{- !$disabled{"quic"} && $target{sys_id} ne "AMIGA" -}]
     PROGRAMS{noinst}=quic-client-test
   ENDIF
- ENDIF
 
   SOURCE[asn1-test]=asn1.c test-corpus.c fuzz_rand.c
   INCLUDE[asn1-test]=../include
diff --git a/openssl/providers/implementations/rands/seeding/build.info b/openssl/providers/implementations/rands/seeding/build.info
index 8d7edfa9e..5455a6e33 100644
--- a/openssl/providers/implementations/rands/seeding/build.info
+++ b/openssl/providers/implementations/rands/seeding/build.info
@@ -5,7 +5,7 @@ ENDIF
 IF[{- $config{target} =~ /vms/i -}]
   $COMMON=$COMMON rand_vms.c
 ENDIF
-IF[{- $config{target} =~ /amiga/i -}]
+IF[{- $target{sys_id} eq "AMIGA" -}]
   $COMMON=$COMMON rand_amiga.c
 ENDIF
 IF[{- !$disabled{asm} && $config{target} =~ '.*aarch64' -}]
diff --git a/openssl/test/build.info b/openssl/test/build.info
index 5aad19b81..4b6b58b9a 100644
--- a/openssl/test/build.info
+++ b/openssl/test/build.info
@@ -72,12 +72,10 @@ IF[{- !$disabled{tests} -}]
     PROGRAMS{noinst}=enginetest
   ENDIF
 
- IF[{- $config{target} !~ /amiga/ -}]
-  IF[{- !$disabled{quic} -}]
+  IF[{- !$disabled{quic} && $target{sys_id} ne "AMIGA" -}]
     PROGRAMS{noinst}=priority_queue_test event_queue_test quicfaultstest quicapitest \
                      quic_newcid_test
   ENDIF
- ENDIF
 
   IF[{- !$disabled{comp} && (!$disabled{brotli} || !$disabled{zstd} || !$disabled{zlib}) -}]
     PROGRAMS{noinst}=cert_comp_test
@@ -632,7 +630,7 @@ IF[{- !$disabled{tests} -}]
     INCLUDE[moduleloadtest]=../include ../apps/include
   ENDIF
 
- IF[{- $config{target} !~ /amiga/ -}]
+ IF[{- $target{sys_id} ne "AMIGA" -}]
   # cipher_overhead_test uses internal symbols, so it must be linked with
   # the static libraries
   PROGRAMS{noinst}=cipher_overhead_test
@@ -669,13 +667,11 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[conf_include_test]=../include ../apps/include
   DEPEND[conf_include_test]=../libcrypto libtestutil.a
 
- IF[{- $config{target} !~ /amiga/ -}]
-  IF[{- !$disabled{cmp} -}]
+  IF[{- !$disabled{cmp} && $target{sys_id} ne "AMIGA" -}]
     PROGRAMS{noinst}=cmp_asn_test cmp_ctx_test cmp_status_test cmp_hdr_test \
                      cmp_protect_test cmp_msg_test cmp_vfy_test \
                      cmp_server_test cmp_client_test
   ENDIF
- ENDIF
 
   SOURCE[cmp_asn_test]=cmp_asn_test.c helpers/cmp_testlib.c
   INCLUDE[cmp_asn_test]=.. ../include ../apps/include
@@ -726,7 +722,7 @@ IF[{- !$disabled{tests} -}]
   # and VMS, where the exported symbols are those listed in util/*.num), these
   # programs are forcibly linked with the static libraries, where all symbols
   # are always available.
-  IF[{- $config{target} !~ /amiga/ -}]
+  IF[{- $target{sys_id} ne "AMIGA" -}]
     PROGRAMS{noinst}=asn1_internal_test modes_internal_test x509_internal_test \
                      tls13encryptiontest wpackettest ctype_internal_test \
                      rdcpu_sanitytest property_test ideatest rsa_mp_test \
@@ -968,7 +964,7 @@ IF[{- !$disabled{tests} -}]
     DEPEND[algorithmid_test]=../libcrypto.a libtestutil.a
   ENDIF
 
- IF[{- $config{target} !~ /amiga/ -}]
+ IF[{- $target{sys_id} ne "AMIGA" -}]
   PROGRAMS{noinst}=asn1_time_test
   SOURCE[asn1_time_test]=asn1_time_test.c ../crypto/ctype.c \
                          ../crypto/asn1/a_time.c
@@ -1004,7 +1000,7 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[aesgcmtest]=../include ../apps/include ..
   DEPEND[aesgcmtest]=../libcrypto libtestutil.a
 
- IF[{- $config{target} !~ /amiga/ -}]
+ IF[{- $target{sys_id} ne "AMIGA" -}]
   PROGRAMS{noinst}=context_internal_test
   SOURCE[context_internal_test]=context_internal_test.c
   INCLUDE[context_internal_test]=.. ../include ../apps/include
@@ -1064,7 +1060,7 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[params_test]=.. ../include ../apps/include
   DEPEND[params_test]=../libcrypto.a libtestutil.a
 
- IF[{- $config{target} !~ /amiga/ -}]
+ IF[{- $target{sys_id} ne "AMIGA" -}]
   PROGRAMS{noinst}=hexstr_test
   SOURCE[hexstr_test]=hexstr_test.c
   INCLUDE[hexstr_test]=.. ../include ../apps/include
@@ -1134,14 +1130,12 @@ ENDIF
     DEPEND[timing_load_creds]=../libcrypto.a
   ENDIF
 
- IF[{- $config{target} !~ /amiga/ -}]
-  IF[{- !$disabled{'quic'} -}]
+  IF[{- !$disabled{'quic'} && $target{sys_id} ne "AMIGA" -}]
     PROGRAMS{noinst}=quic_wire_test quic_ackm_test quic_record_test
     PROGRAMS{noinst}=quic_fc_test quic_stream_test quic_cfq_test quic_txpim_test
     PROGRAMS{noinst}=quic_fifd_test quic_txp_test quic_tserver_test
     PROGRAMS{noinst}=quic_client_test quic_cc_test quic_multistream_test
   ENDIF
- ENDIF
 
   SOURCE[quic_ackm_test]=quic_ackm_test.c cc_dummy.c
   INCLUDE[quic_ackm_test]=../include ../apps/include
diff --git a/openssl/util/build.info b/openssl/util/build.info
index 276f3d3e1..767d550fb 100644
--- a/openssl/util/build.info
+++ b/openssl/util/build.info
@@ -6,11 +6,9 @@ SCRIPTS{noinst}=wrap.pl
 SOURCE[wrap.pl]=wrap.pl.in
 DEPEND[wrap.pl]=../configdata.pm
 
-IF[{- $config{target} !~ /amiga/ -}]
-IF[{- !$disabled{quic} && !$disabled{stdio} -}]
+IF[{- !$disabled{quic} && !$disabled{stdio} && $target{sys_id} ne "AMIGA" -}]
   PROGRAMS{noinst}=quicserver
   SOURCE[quicserver]=quicserver.c
 INCLUDE[quicserver]=../include ../apps/include
 DEPEND[quicserver]=../libcrypto.a ../libssl.a
-ENDIF
 ENDIF
\ No newline at end of file