diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile
index 7f2844d1855d..29496a0e319c 100644
--- a/shells/ksh-devel/Makefile
+++ b/shells/ksh-devel/Makefile
@@ -50,7 +50,7 @@ KSH93D_DESC=		Install to ${PREFIX}/bin/ksh93d (development)
 
 CFLAGS+=	-DMAP_TYPE
 LDFLAGS+=	-lm
-MAKE_ENV=	CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses -Wno-int-conversion" CFLAGS="${CFLAGS}"
+MAKE_ENV=	CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses" CFLAGS="${CFLAGS}"
 
 STATIC_MAKE_ENV=	LDFLAGS+=-static
 
diff --git a/shells/ksh-devel/files/patch-src_lib_libast_aso_aso.c b/shells/ksh-devel/files/patch-src_lib_libast_aso_aso.c
new file mode 100644
index 000000000000..6ab5be771f7a
--- /dev/null
+++ b/shells/ksh-devel/files/patch-src_lib_libast_aso_aso.c
@@ -0,0 +1,11 @@
+--- src/lib/libast/aso/aso.c.orig	2023-01-11 01:32:04.000000000 -0800
++++ src/lib/libast/aso/aso.c	2023-02-15 06:41:07.380213000 -0800
+@@ -836,7 +836,7 @@
+ 
+ #if defined(_aso_casptr)
+ 	if (!state.lockf)
+-		return _aso_casptr((void**)p, o, n);
++		return _aso_cas64((void**)p, o, n);
+ #endif
+ 	k = lock(state.data, 0, p);
+ 	if (*(void* volatile*)p == o)
diff --git a/shells/ksh/Makefile b/shells/ksh/Makefile
index e006024685ed..ca0d38165128 100644
--- a/shells/ksh/Makefile
+++ b/shells/ksh/Makefile
@@ -44,7 +44,7 @@ KSH93N_DESC=		Install to ${PREFIX}/bin/ksh93n (new)
 
 CFLAGS+=	-DMAP_TYPE
 LDFLAGS+=	-lm
-MAKE_ENV=	CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses -Wno-int-conversion" CFLAGS="${CFLAGS}"
+MAKE_ENV=	CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses" CFLAGS="${CFLAGS}"
 
 STATIC_MAKE_ENV=	LDFLAGS+=-static
 
diff --git a/shells/ksh/files/patch-src_lib_libast_aso_aso.c b/shells/ksh/files/patch-src_lib_libast_aso_aso.c
new file mode 100644
index 000000000000..891c022d470e
--- /dev/null
+++ b/shells/ksh/files/patch-src_lib_libast_aso_aso.c
@@ -0,0 +1,11 @@
+--- src/lib/libast/aso/aso.c.orig	2022-10-21 20:05:14.000000000 -0700
++++ src/lib/libast/aso/aso.c	2023-02-15 06:39:08.156515000 -0800
+@@ -836,7 +836,7 @@
+ 
+ #if defined(_aso_casptr)
+ 	if (!state.lockf)
+-		return _aso_casptr((void**)p, o, n);
++		return _aso_cas64((void**)p, o, n);
+ #endif
+ 	k = lock(state.data, 0, p);
+ 	if (*(void* volatile*)p == o)