diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index 4de3f23e..4244cbc1 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -19,6 +19,7 @@ AM_CPPFLAGS = \
   $(IMLIB2_CFLAGS)
 
 XRDP_EXTRA_LIBS =
+XRDP_EXTRA_SOURCES =
 
 if XRDP_RFXCODEC
 AM_CPPFLAGS += -DXRDP_RFXCODEC
@@ -26,6 +27,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
 XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.a
 endif
 
+if XRDP_X264
+AM_CPPFLAGS += -DXRDP_X264
+AM_CPPFLAGS += $(XRDP_X264_CFLAGS)
+XRDP_EXTRA_LIBS += $(XRDP_X264_LIBS)
+XRDP_EXTRA_SOURCES += xrdp_encoder_x264.c xrdp_encoder_x264.h
+endif
+
 if XRDP_PIXMAN
 AM_CPPFLAGS += -DXRDP_PIXMAN
 AM_CPPFLAGS += $(PIXMAN_CFLAGS)
@@ -64,7 +72,8 @@ xrdp_SOURCES = \
   xrdp_egfx.c \
   xrdp_egfx.h \
   xrdp_wm.c \
-  xrdp_main_utils.c
+  xrdp_main_utils.c \
+  $(XRDP_EXTRA_SOURCES)
 
 xrdp_LDADD = \
   $(top_builddir)/common/libcommon.la \
diff --git a/xrdp/xrdp_encoder.c b/xrdp/xrdp_encoder.c
index 3bb0f7f4..dfd4548d 100644
--- a/xrdp/xrdp_encoder.c
+++ b/xrdp/xrdp_encoder.c
@@ -34,6 +34,10 @@
 #include "rfxcodec_encode.h"
 #endif
 
+#ifdef XRDP_X264
+#include "xrdp_encoder_x264.h"
+#endif
+
 #define DEFAULT_XRDP_GFX_FRAMES_IN_FLIGHT 2
 /* limits used for validate env var XRDP_GFX_FRAMES_IN_FLIGHT */
 #define MIN_XRDP_GFX_FRAMES_IN_FLIGHT 1
diff --git a/xrdp/xrdp_encoder_x264.c b/xrdp/xrdp_encoder_x264.c
new file mode 100644
index 00000000..ee87586f
--- /dev/null
+++ b/xrdp/xrdp_encoder_x264.c
@@ -0,0 +1,242 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2016-2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * x264 Encoder
+ */
+
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+#include <x264.h>
+
+#include "xrdp.h"
+#include "arch.h"
+#include "os_calls.h"
+#include "xrdp_encoder_x264.h"
+
+#define X264_MAX_ENCODERS 16
+
+struct x264_encoder
+{
+    x264_t *x264_enc_han;
+    char *yuvdata;
+    x264_param_t x264_params;
+    int width;
+    int height;
+};
+
+struct x264_global
+{
+    struct x264_encoder encoders[X264_MAX_ENCODERS];
+};
+
+/*****************************************************************************/
+void *
+xrdp_encoder_x264_create(void)
+{
+    struct x264_global *xg;
+
+    LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_encoder_x264_create:");
+    xg = g_new0(struct x264_global, 1);
+    if (xg == NULL)
+    {
+        return NULL;
+    }
+    return xg;
+}
+
+/*****************************************************************************/
+int
+xrdp_encoder_x264_delete(void *handle)
+{
+    struct x264_global *xg;
+    struct x264_encoder *xe;
+    int index;
+
+    if (handle == NULL)
+    {
+        return 0;
+    }
+    xg = (struct x264_global *) handle;
+    for (index = 0; index < 16; index++)
+    {
+        xe = &(xg->encoders[index]);
+        if (xe->x264_enc_han != NULL)
+        {
+            x264_encoder_close(xe->x264_enc_han);
+        }
+        g_free(xe->yuvdata);
+    }
+    g_free(xg);
+    return 0;
+}
+
+/*****************************************************************************/
+int
+xrdp_encoder_x264_encode(void *handle, int session, int left, int top,
+                         int width, int height, int twidth, int theight,
+                         int format, const char *data,
+                         short *crects, int num_crects,
+                         char *cdata, int *cdata_bytes, int *flags_ptr)
+{
+    struct x264_global *xg;
+    struct x264_encoder *xe;
+    const char *src8;
+    char *dst8;
+    int index;
+    x264_nal_t *nals;
+    int num_nals;
+    int frame_size;
+    int x264_width_height;
+    int flags;
+    int x;
+    int y;
+    int cx;
+    int cy;
+
+    x264_picture_t pic_in;
+    x264_picture_t pic_out;
+
+    LOG(LOG_LEVEL_TRACE, "xrdp_encoder_x264_encode:");
+    flags = 0;
+    xg = (struct x264_global *) handle;
+    xe = &(xg->encoders[session % X264_MAX_ENCODERS]);
+    if ((xe->x264_enc_han == NULL) ||
+            (xe->width != width) || (xe->height != height))
+    {
+        if (xe->x264_enc_han != NULL)
+        {
+            LOG(LOG_LEVEL_INFO, "xrdp_encoder_x264_encode: "
+                "x264_encoder_close %p", xe->x264_enc_han);
+            x264_encoder_close(xe->x264_enc_han);
+            xe->x264_enc_han = NULL;
+            g_free(xe->yuvdata);
+            xe->yuvdata = NULL;
+            flags |= 2;
+        }
+        if ((width > 0) && (height > 0))
+        {
+            //x264_param_default_preset(&(xe->x264_params), "superfast", "zerolatency");
+            x264_param_default_preset(&(xe->x264_params), "ultrafast", "zerolatency");
+            xe->x264_params.i_threads = 1;
+            xe->x264_params.i_width = width;
+            xe->x264_params.i_height = height;
+            xe->x264_params.i_fps_num = 24;
+            xe->x264_params.i_fps_den = 1;
+            //xe->x264_params.b_cabac = 1;
+            //xe->x264_params.i_bframe = 0;
+            //xe->x264_params.rc.i_rc_method = X264_RC_CQP;
+            //xe->x264_params.rc.i_qp_constant = 23;
+            //x264_param_apply_profile(&(xe->x264_params), "high");
+            x264_param_apply_profile(&(xe->x264_params), "main");
+            //x264_param_apply_profile(&(xe->x264_params), "baseline");
+            xe->x264_enc_han = x264_encoder_open(&(xe->x264_params));
+            LOG(LOG_LEVEL_INFO, "xrdp_encoder_x264_encode: "
+                "x264_encoder_open rv %p for width %d height %d",
+                xe->x264_enc_han, width, height);
+            if (xe->x264_enc_han == NULL)
+            {
+                return 1;
+            }
+            xe->yuvdata = g_new(char, width * height * 2);
+            if (xe->yuvdata == NULL)
+            {
+                x264_encoder_close(xe->x264_enc_han);
+                xe->x264_enc_han = NULL;
+                return 2;
+            }
+            flags |= 1;
+        }
+        xe->width = width;
+        xe->height = height;
+    }
+
+    if ((data != NULL) && (xe->x264_enc_han != NULL))
+    {
+        x264_width_height = xe->x264_params.i_width * xe->x264_params.i_height;
+        for (index = 0; index < num_crects; index++)
+        {
+            src8 = data;
+            dst8 = xe->yuvdata;
+            x = crects[index * 4 + 0];
+            y = crects[index * 4 + 1];
+            cx = crects[index * 4 + 2];
+            cy = crects[index * 4 + 3];
+            LOG_DEVEL(LOG_LEVEL_INFO, "xrdp_encoder_x264_encode: x %d y %d "
+                      "cx %d cy %d", x, y, cx, cy);
+            src8 += twidth * y + x;
+            dst8 += xe->x264_params.i_width * (y - top) + (x - left);
+            for (; cy > 0; cy -= 1)
+            {
+                g_memcpy(dst8, src8, cx);
+                src8 += twidth;
+                dst8 += xe->x264_params.i_width;
+            }
+        }
+        for (index = 0; index < num_crects; index++)
+        {
+            src8 = data;
+            src8 += twidth * theight;
+            dst8 = xe->yuvdata;
+            dst8 += x264_width_height;
+            x = crects[index * 4 + 0];
+            y = crects[index * 4 + 1];
+            cx = crects[index * 4 + 2];
+            cy = crects[index * 4 + 3];
+            src8 += twidth * (y / 2) + x;
+            dst8 += xe->x264_params.i_width * ((y - top) / 2) + (x - left);
+            for (; cy > 0; cy -= 2)
+            {
+                g_memcpy(dst8, src8, cx);
+                src8 += twidth;
+                dst8 += xe->x264_params.i_width;
+            }
+        }
+        g_memset(&pic_in, 0, sizeof(pic_in));
+        pic_in.img.i_csp = X264_CSP_NV12;
+        pic_in.img.i_plane = 2;
+        pic_in.img.plane[0] = (unsigned char *) (xe->yuvdata);
+        pic_in.img.plane[1] = (unsigned char *)
+                              (xe->yuvdata + x264_width_height);
+        pic_in.img.i_stride[0] = xe->x264_params.i_width;
+        pic_in.img.i_stride[1] = xe->x264_params.i_width;
+        num_nals = 0;
+        frame_size = x264_encoder_encode(xe->x264_enc_han, &nals, &num_nals,
+                                         &pic_in, &pic_out);
+        LOG(LOG_LEVEL_TRACE, "i_type %d", pic_out.i_type);
+        if (frame_size < 1)
+        {
+            return 3;
+        }
+        if (*cdata_bytes < frame_size)
+        {
+            return 4;
+        }
+        g_memcpy(cdata, nals[0].p_payload, frame_size);
+        *cdata_bytes = frame_size;
+    }
+    if (flags_ptr != NULL)
+    {
+        *flags_ptr = flags;
+    }
+    return 0;
+}
diff --git a/xrdp/xrdp_encoder_x264.h b/xrdp/xrdp_encoder_x264.h
new file mode 100644
index 00000000..0d7ec5ba
--- /dev/null
+++ b/xrdp/xrdp_encoder_x264.h
@@ -0,0 +1,38 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2016-2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * libx264 Encoder
+ */
+
+#ifndef _XRDP_ENCODER_X264_H
+#define _XRDP_ENCODER_X264_H
+
+#include "arch.h"
+
+void *
+xrdp_encoder_x264_create(void);
+int
+xrdp_encoder_x264_delete(void *handle);
+int
+xrdp_encoder_x264_encode(void *handle, int session, int left, int top,
+                         int width, int height, int twidth, int theight,
+                         int format, const char *data,
+                         short *crects, int num_crects,
+                         char *cdata, int *cdata_bytes, int *flags_ptr);
+
+#endif
+