diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 6376e98..e50bde2 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -10,13 +10,13 @@ FROM ${BASEIMAGE}
 # Define software versions.
 ARG LIBVNCSERVER_VERSION=0.9.11
 ARG X11VNC_VERSION=0.9.14
-ARG NOVNC_VERSION=0.6.2
+ARG NOVNC_VERSION=0.6.2-fixes
 ARG S6_OVERLAY_VERSION=1.19.1.1
 
 # Define software download URLs.
 ARG LIBVNCSERVER_URL=https://github.com/jlesage/libvncserver/archive/LibVNCServer-${LIBVNCSERVER_VERSION}-fixes.tar.gz
 ARG X11VNC_URL=https://github.com/LibVNC/x11vnc/archive/${X11VNC_VERSION}.tar.gz
-ARG NOVNC_URL=https://github.com/novnc/novnc/archive/v${NOVNC_VERSION}.tar.gz
+ARG NOVNC_URL=https://github.com/jlesage/novnc/archive/v${NOVNC_VERSION}.tar.gz
 ARG S6_OVERLAY_URL=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz
 
 # Define working directory.
@@ -98,17 +98,13 @@ RUN \
 
 # Install noVNC.
 RUN \
-    apk --no-cache add --virtual build-dependencies curl patch && \
+    apk --no-cache add --virtual build-dependencies curl && \
     curl -sS -L ${NOVNC_URL} | tar -xz && \
     mkdir -p /opt/novnc && \
     cp -R noVNC-${NOVNC_VERSION}/favicon.ico \
           noVNC-${NOVNC_VERSION}/images \
           noVNC-${NOVNC_VERSION}/include \
           /opt/novnc/ && \
-    CURDIR="$(pwd)" && cd / && \
-    # Apply patch: register mouse click events even if touch is available.
-    curl -sS -L https://gist.githubusercontent.com/jlesage/e30c298dbb2c4dd3fe086cdf8aad6ed1/raw/1cef9daf07730a3ae0635fe3532dd8883e3a5610/input.js.patch | patch -p0 && \
-    cd "$CURDIR" && \
     # Cleanup
     apk --no-cache del build-dependencies && \
     rm -rf /tmp/*
diff --git a/Dockerfile.alpine-glibc b/Dockerfile.alpine-glibc
index 65b7260..95ba4d4 100644
--- a/Dockerfile.alpine-glibc
+++ b/Dockerfile.alpine-glibc
@@ -10,13 +10,13 @@ FROM ${BASEIMAGE}
 # Define software versions.
 ARG LIBVNCSERVER_VERSION=0.9.11
 ARG X11VNC_VERSION=0.9.14
-ARG NOVNC_VERSION=0.6.2
+ARG NOVNC_VERSION=0.6.2-fixes
 ARG S6_OVERLAY_VERSION=1.19.1.1
 
 # Define software download URLs.
 ARG LIBVNCSERVER_URL=https://github.com/jlesage/libvncserver/archive/LibVNCServer-${LIBVNCSERVER_VERSION}-fixes.tar.gz
 ARG X11VNC_URL=https://github.com/LibVNC/x11vnc/archive/${X11VNC_VERSION}.tar.gz
-ARG NOVNC_URL=https://github.com/novnc/novnc/archive/v${NOVNC_VERSION}.tar.gz
+ARG NOVNC_URL=https://github.com/jlesage/novnc/archive/v${NOVNC_VERSION}.tar.gz
 ARG S6_OVERLAY_URL=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz
 
 # Define GLIBC variables.
@@ -134,17 +134,13 @@ RUN \
 
 # Install noVNC.
 RUN \
-    apk --no-cache add --virtual build-dependencies curl patch && \
+    apk --no-cache add --virtual build-dependencies curl && \
     curl -sS -L ${NOVNC_URL} | tar -xz && \
     mkdir -p /opt/novnc && \
     cp -R noVNC-${NOVNC_VERSION}/favicon.ico \
           noVNC-${NOVNC_VERSION}/images \
           noVNC-${NOVNC_VERSION}/include \
           /opt/novnc/ && \
-    CURDIR="$(pwd)" && cd / && \
-    # Apply patch: register mouse click events even if touch is available.
-    curl -sS -L https://gist.githubusercontent.com/jlesage/e30c298dbb2c4dd3fe086cdf8aad6ed1/raw/1cef9daf07730a3ae0635fe3532dd8883e3a5610/input.js.patch | patch -p0 && \
-    cd "$CURDIR" && \
     # Cleanup
     apk --no-cache del build-dependencies && \
     rm -rf /tmp/*
diff --git a/Dockerfile.debian b/Dockerfile.debian
index ccc4afe..d026d6b 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -10,13 +10,13 @@ FROM ${BASEIMAGE}
 # Define software versions.
 ARG LIBVNCSERVER_VERSION=0.9.11
 ARG X11VNC_VERSION=0.9.14
-ARG NOVNC_VERSION=0.6.2
+ARG NOVNC_VERSION=0.6.2-fixes
 ARG S6_OVERLAY_VERSION=1.19.1.1
 
 # Define software download URLs.
 ARG LIBVNCSERVER_URL=https://github.com/jlesage/libvncserver/archive/LibVNCServer-${LIBVNCSERVER_VERSION}-fixes.tar.gz
 ARG X11VNC_URL=https://github.com/LibVNC/x11vnc/archive/${X11VNC_VERSION}.tar.gz
-ARG NOVNC_URL=https://github.com/novnc/novnc/archive/v${NOVNC_VERSION}.tar.gz
+ARG NOVNC_URL=https://github.com/jlesage/novnc/archive/v${NOVNC_VERSION}.tar.gz
 ARG S6_OVERLAY_URL=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz
 
 # Variables needed for package installation via APT.
@@ -124,7 +124,7 @@ RUN \
 
 # Install noVNC.
 RUN \
-    BUILD_PACKAGES="curl ca-certificates patch" && \
+    BUILD_PACKAGES="curl ca-certificates" && \
     apt-get update && apt-get install -y --no-install-recommends \
         $BUILD_PACKAGES && \
     curl -sS -L ${NOVNC_URL} | tar -xz && \
@@ -133,10 +133,6 @@ RUN \
           noVNC-${NOVNC_VERSION}/images \
           noVNC-${NOVNC_VERSION}/include \
           /opt/novnc/ && \
-    CURDIR="$(pwd)" && cd / && \
-    # Apply patch: register mouse click events even if touch is available.
-    curl -sS -L https://gist.githubusercontent.com/jlesage/e30c298dbb2c4dd3fe086cdf8aad6ed1/raw/1cef9daf07730a3ae0635fe3532dd8883e3a5610/input.js.patch | patch -p0 && \
-    cd "$CURDIR" && \
     # Cleanup
     apt-get clean && \
     apt-get purge -y $BUILD_PACKAGES && \