diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 6d96ad009979..65d9e9480983 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libX11
-PORTVERSION=	1.6.7
+PORTVERSION=	1.6.8
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 35c7b27fd809..c70c8bc636d1 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540956919
-SHA256 (xorg/lib/libX11-1.6.7.tar.bz2) = 910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348
-SIZE (xorg/lib/libX11-1.6.7.tar.bz2) = 2290260
+TIMESTAMP = 1560786095
+SHA256 (xorg/lib/libX11-1.6.8.tar.bz2) = b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5
+SIZE (xorg/lib/libX11-1.6.8.tar.bz2) = 2395911
diff --git a/x11/libX11/files/patch-src_util_makekeys.c b/x11/libX11/files/patch-src_util_makekeys.c
new file mode 100644
index 000000000000..bdde9d79f3d5
--- /dev/null
+++ b/x11/libX11/files/patch-src_util_makekeys.c
@@ -0,0 +1,14 @@
+--- src/util/makekeys.c.orig	2019-06-17 14:47:35 UTC
++++ src/util/makekeys.c
+@@ -35,8 +35,10 @@ from The Open Group.
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdint.h>
++#include <inttypes.h>
+ 
+-#include "../Xresinternal.h"
++typedef uint32_t Signature;
+ 
+ #define KTNUM 4000
+ 
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index 79595dcfb5be..75c03fff9729 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -789,7 +789,7 @@ man/man3/XkbAllocGeomDoodads.3.gz
 man/man3/XkbAllocGeomKeyAliases.3.gz
 man/man3/XkbAllocGeomKeys.3.gz
 man/man3/XkbAllocGeomOutlines.3.gz
-man/man3/XkbAllocGeomOverlayKey.3.gz
+man/man3/XkbAllocGeomOverlayKeys.3.gz
 man/man3/XkbAllocGeomOverlayRows.3.gz
 man/man3/XkbAllocGeomOverlays.3.gz
 man/man3/XkbAllocGeomPoints.3.gz