diff --git a/.gitattributes b/.gitattributes
index 2f39ca7f1e..1d034971f0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10152,6 +10152,7 @@ packages/x11/src/sunkeysym.pp svneol=native#text/plain
 packages/x11/src/x.pp svneol=native#text/plain
 packages/x11/src/xatom.pp svneol=native#text/plain
 packages/x11/src/xcms.pp svneol=native#text/plain
+packages/x11/src/xext.pp svneol=native#text/plain
 packages/x11/src/xf86dga.pp svneol=native#text/plain
 packages/x11/src/xf86dga1.inc svneol=native#text/plain
 packages/x11/src/xf86keysym.pp svneol=native#text/plain
diff --git a/packages/x11/fpmake.pp b/packages/x11/fpmake.pp
index af8cb292d9..0baaec477b 100644
--- a/packages/x11/fpmake.pp
+++ b/packages/x11/fpmake.pp
@@ -138,6 +138,8 @@ begin
     T.Dependencies.AddUnit('xlib');
     T.Dependencies.AddUnit('xrender');
     T.Dependencies.AddUnit('fontconfig');
+    T:=P.Targets.AddUnit('xext.pas');
+    T.Dependencies.AddUnit('xlib');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/x11/src/xext.pp b/packages/x11/src/xext.pp
new file mode 100644
index 0000000000..ca588ed719
--- /dev/null
+++ b/packages/x11/src/xext.pp
@@ -0,0 +1,58 @@
+(*
+ *
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+ *)
+
+unit xext;
+
+{$PACKRECORDS C}
+
+interface
+
+uses
+  ctypes, xlib;
+
+const
+  libXext = 'Xext';
+  X_EXTENSION_UNKNOWN = 'unknown';
+  X_EXTENSION_MISSING = 'missing';
+
+type
+  XextErrorHandler = function(
+    dpy: PDisplay;
+    {_Xconst} ext_name: Pchar;
+    {_Xconst} reason: PChar
+  ): cint; cdecl;
+
+function XSetExtensionErrorHandler(
+    handler: XextErrorHandler
+): XextErrorHandler; cdecl; external libXext;
+
+function XMissingExtension(
+    dpy: PDisplay;
+    {_Xconst} ext_name: PChar
+): cint; cdecl; external libXext;
+
+implementation
+
+end.