diff --git a/x11vnc.yaml b/x11vnc.yaml
index a7c4ef6fd22..0550bee4aba 100644
--- a/x11vnc.yaml
+++ b/x11vnc.yaml
@@ -1,7 +1,7 @@
 package:
   name: x11vnc
-  version: 0.9.16
-  epoch: 2
+  version: "0.9.17"
+  epoch: 0
   description: VNC server for real X displays
   copyright:
     - license: GPL-2.0-or-later
@@ -61,11 +61,7 @@ pipeline:
     with:
       repository: https://github.com/LibVNC/x11vnc
       tag: ${{package.version}}
-      expected-commit: 4ca006fed80410bd9b061a1519bd5d9366bb0bc8
-
-  - uses: patch
-    with:
-      patches: gcc-10.patch
+      expected-commit: e2b726a8c0464051afda01648072af6835aaa5f7
 
   - runs: autoupdate
 
diff --git a/x11vnc/gcc-10.patch b/x11vnc/gcc-10.patch
deleted file mode 100644
index 95ba9b6de3c..00000000000
--- a/x11vnc/gcc-10.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Tue, 28 Jan 2020 22:21:01 +0300
-Subject: [PATCH] Fix build with -fno-common
-
-GCC 10 defaults to -fno-common
----
- src/util.c | 3 +++
- src/util.h | 6 +++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/util.c b/src/util.c
-index a82a1a4..6a52ebf 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -47,6 +47,9 @@ int hxl = 0;
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
- MUTEX(x11Mutex);
- MUTEX(scrollMutex);
-+MUTEX(clientMutex);
-+MUTEX(inputMutex);
-+MUTEX(pointerMutex);
- #endif
- 
- int nfix(int i, int n);
-diff --git a/src/util.h b/src/util.h
-index 35c1afd..99b5dd1 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
- extern MUTEX(x11Mutex);
- extern MUTEX(scrollMutex);
--MUTEX(clientMutex);
--MUTEX(inputMutex);
--MUTEX(pointerMutex);
-+extern MUTEX(clientMutex);
-+extern MUTEX(inputMutex);
-+extern MUTEX(pointerMutex);
- #endif
- 
- #define X_INIT INIT_MUTEX(x11Mutex)
--- 
-2.24.1