diff --git a/neon-0.30.2-backport-mak-Replace-GX-with-EHsc.patch b/neon-0.30.2-backport-mak-Replace-GX-with-EHsc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2ea1d7cf295a3ca34cf7af0945c479339ced8be2
--- /dev/null
+++ b/neon-0.30.2-backport-mak-Replace-GX-with-EHsc.patch
@@ -0,0 +1,32 @@
+From 6d33a725679c2fca903621c67db03d1b4857cfe3 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Wed, 23 Mar 2022 11:18:04 +0800
+Subject: [PATCH] neon.mak: Replace /GX with /EHsc
+
+The /GX option has been deprecated and replaced with /EHsc, so use that to
+eliminate a cl.exe command line warning.
+---
+ neon.mak | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/neon.mak b/neon.mak
+index ce53a30..1d26d3b 100644
+--- a/neon.mak
++++ b/neon.mak
+@@ -12,11 +12,11 @@ NULL=nul
+ # Debug vs. Release build
+ !IF "$(DEBUG_BUILD)" == ""
+ INTDIR = Release
+-CFLAGS = /MD /W3 /GX /O2 /D "NDEBUG"
++CFLAGS = /MD /W3 /EHsc /O2 /D "NDEBUG"
+ TARGET = .\libneon.lib
+ !ELSE
+ INTDIR = Debug
+-CFLAGS = /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG"
++CFLAGS = /MDd /W3 /Gm /EHsc /Zi /Od /D "_DEBUG"
+ TARGET = .\libneonD.lib
+ !ENDIF
+ 
+-- 
+2.27.0
+
diff --git a/neon.spec b/neon.spec
index 994e11c55f9d47a2dfb1cc845a8f9eab55805ba0..3695ca1db6c94162ecd9d78f82aa2c573cd181c4 100644
--- a/neon.spec
+++ b/neon.spec
@@ -1,6 +1,6 @@
 Name:		neon
 Version:	0.30.2
-Release: 	12
+Release: 	13
 Summary:	An HTTP and WebDAV client library
 License:	LGPLv2+
 URL:		http://www.webdav.org/neon/
@@ -11,6 +11,7 @@ Patch0:		neon-0.27.0-multilib.patch
 Patch1:		neon-0.30.2-sysuioh.patch
 Patch2:		neon-0.30.2-lockprintf.patch
 Patch3:		neon-0.30.2-test-.c-Switch-to-destroy_and_wait-in-various-places.patch
+Patch4:		neon-0.30.2-backport-mak-Replace-GX-with-EHsc.patch
 
 BuildRequires:  gcc git openssl-devel expat-devel gdb-headless
 Requires:	ca-certificates
@@ -84,6 +85,9 @@ sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 29 2022 Guangzhong Yao <yaoguangzhong@xfusion.com> - 0.30.2-13
+- DESC: backport neon.mak Replace GX with EHsc
+
 * Thu Dec 29 2022 Guangzhong Yao <yaoguangzhong@xfusion.com> - 0.30.2-12
 - DESC: backport Switch to destroy_and_wait() in various places