diff --git a/.gitignore b/.gitignore
index b9b1156..ea3fa61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ xf86-video-vmware-11.0.1.tar.bz2
 /xf86-video-vmware-20140613.tar.bz2
 /xf86-video-vmware-20150211.tar.bz2
 /xf86-video-vmware-13.2.1.tar.bz2
+/xf86-video-vmware-13.3.0.tar.bz2
diff --git a/0012-vmwgfx-Change-header-inclusion-order-to-avoid-xorg-h.patch b/0012-vmwgfx-Change-header-inclusion-order-to-avoid-xorg-h.patch
new file mode 100644
index 0000000..941dc30
--- /dev/null
+++ b/0012-vmwgfx-Change-header-inclusion-order-to-avoid-xorg-h.patch
@@ -0,0 +1,60 @@
+From 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 Mon Sep 17 00:00:00 2001
+From: Martin Krastev <krastevm@vmware.com>
+Date: Tue, 30 Nov 2021 11:47:39 -0800
+Subject: [PATCH 12/18] vmwgfx: Change header inclusion order to avoid xorg
+ headers catching stdbool.h
+
+libdrm commit e641e2a632d779f638ac2ba983b9fceb20b3fac4 added
+stdbool.h to the library headers which conflicts with xorg headers.
+
+Signed-off-by: Martin Krastev <krastevm@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_driver.h | 6 +++---
+ vmwgfx/vmwgfx_saa.c    | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
+index fa8e308..467fb21 100644
+--- a/vmwgfx/vmwgfx_driver.h
++++ b/vmwgfx/vmwgfx_driver.h
+@@ -36,15 +36,15 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <errno.h>
+-#include <drm.h>
+-#include <xf86drm.h>
+-#include <xf86drmMode.h>
+ #include <xorg-server.h>
+ #include <xf86.h>
+ #include <xf86Crtc.h>
+ #include <xf86xv.h>
+ #include <xa_tracker.h>
+ #include <xf86Module.h>
++#include <drm.h>
++#include <xf86drm.h>
++#include <xf86drmMode.h>
+ 
+ #include "../src/compat-api.h"
+ #ifdef DRI2
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 0881e2f..457f397 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -29,11 +29,11 @@
+ #include <xorgVersion.h>
+ #include <mi.h>
+ #include <fb.h>
+-#include <xf86drmMode.h>
+ #include <xa_context.h>
+ #include "vmwgfx_saa.h"
+ #include "vmwgfx_drmi.h"
+ #include "vmwgfx_saa_priv.h"
++#include <xf86drmMode.h>
+ 
+ /*
+  * Damage to be added as soon as we attach storage to the pixmap.
+-- 
+2.38.1
+
diff --git a/0013-vmwgfx-fix-missing-array-notation.patch b/0013-vmwgfx-fix-missing-array-notation.patch
new file mode 100644
index 0000000..5692b32
--- /dev/null
+++ b/0013-vmwgfx-fix-missing-array-notation.patch
@@ -0,0 +1,33 @@
+From 77b8183b3395333d5d4c73e25c2d011748f15eda Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Sun, 8 May 2022 03:00:10 +0000
+Subject: [PATCH 13/18] vmwgfx: fix missing array notation
+
+ Fixes error identified by gcc-12.1.0 compiler
+
+make
+  CC       libvmwgfx_la-vmwgfx_tex_video.lo
+vmwgfx_tex_video.c: In function 'stop_video':
+vmwgfx_tex_video.c:240:20: error: the comparison will always evaluate as 'true' for the address of 'yuv' will never be NULL [-Werror=address]
+  240 |                if (priv->yuv[i]) {
+      |                    ^~~~
+---
+ vmwgfx/vmwgfx_tex_video.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index acc2b56..480a5f1 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -237,7 +237,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ 
+        for (i=0; i<3; ++i) {
+ 	   for (j=0; j<2; ++j) {
+-	       if (priv->yuv[i]) {
++	       if (priv->yuv[j][i]) {
+ 		   xa_surface_destroy(priv->yuv[j][i]);
+ 		   priv->yuv[j][i] = NULL;
+ 	       }
+-- 
+2.38.1
+
diff --git a/sources b/sources
index cdb0e11..2070a6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xf86-video-vmware-13.2.1.tar.bz2) = 9c48eaf5be6ece5685e07a53842083d091edba482ac0ea8318ac5b0adb9fc468f932685e4bdaf7e565f7a1cf723dcea2731616613798ebde2bbc18418a369a9d
+SHA512 (xf86-video-vmware-13.3.0.tar.bz2) = c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca
diff --git a/xorg-x11-drv-vmware.spec b/xorg-x11-drv-vmware.spec
index 7db5258..1f2a6fd 100644
--- a/xorg-x11-drv-vmware.spec
+++ b/xorg-x11-drv-vmware.spec
@@ -12,19 +12,20 @@
 
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
-Version:    13.2.1
-Release:    18%{?gver}%{?dist}
+Version:    13.3.0
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 
 %if 0%{?gitdate}
 Source0: %{tarball}-%{gitdate}.tar.bz2
 %else
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   https://ftp.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+# upstream compile fixes
+Patch12:   0012-vmwgfx-Change-header-inclusion-order-to-avoid-xorg-h.patch
+Patch13:   0013-vmwgfx-fix-missing-array-notation.patch
 %endif
 
-Patch0: 0001-saa-Build-compatibility-with-xserver-1.20.patch
-
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: make
@@ -42,8 +43,7 @@ Requires: libxatracker >= 8.0.1-4
 X.Org X11 vmware video driver.
 
 %prep
-%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch0 -p1
+%autosetup -p1 -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf -v --install || exit 1
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Thu Dec 08 2022 Yaakov Selkowitz <yselkowi@redhat.com> - 13.3.0-1
+- Update to 13.3.0 (#1579342, #2047133)
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 13.2.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild