diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index 63cf23132dd8..4b609e5573f6 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -133,15 +133,18 @@ PLIST_SUB+=	LIB32=" "
 .if ${ARCH} == amd64
 PLIST_SUB+=	AMD64=" " \
 		AARCH64="@comment " \
-		X86=" "
+		X86=" " \
+		64BIT=" "
 .elif ${ARCH} == i386
 PLIST_SUB+=	AMD64="@comment " \
 		AARCH64="@comment " \
-		X86=" "
+		X86=" " \
+		64BIT="@comment "
 .elif ${ARCH} == aarch64
 PLIST_SUB+=	X86="@comment " \
 		AMD64="@comment " \
-		AARCH64=" "
+		AARCH64=" " \
+		64BIT=" "
 .endif
 
 pre-configure:
diff --git a/lang/gnat12/pkg-plist b/lang/gnat12/pkg-plist
index 0915bd7339f5..531456af8ebc 100644
--- a/lang/gnat12/pkg-plist
+++ b/lang/gnat12/pkg-plist
@@ -5415,10 +5415,10 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imglfl.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imgllb.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imgllf.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imglli.ali
-%%AMD64%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imglllb.ali
-%%AMD64%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imgllli.ali
-%%AMD64%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imglllu.ali
-%%AMD64%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imglllw.ali
+%%64BIT%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imglllb.ali
+%%64BIT%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imgllli.ali
+%%64BIT%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imglllu.ali
+%%64BIT%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imglllw.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imgllu.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imgllw.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-imgrea.ali
@@ -5652,8 +5652,8 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-valint.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-vallfl.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-valllf.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-vallli.ali
-%%AMD64%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-valllli.ali
-%%AMD64%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-vallllu.ali
+%%64BIT%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-valllli.ali
+%%64BIT%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-vallllu.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-valllu.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-valrea.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-valued.ali