diff --git a/bug233919-libXaw.diff b/bug233919-libXaw.diff
new file mode 100644
index 0000000..46a5f25
--- /dev/null
+++ b/bug233919-libXaw.diff
@@ -0,0 +1,11 @@
+--- src/XawI18n.c.orig	2007-01-23 17:57:23.950559108 +0100
++++ src/XawI18n.c	2007-01-23 17:57:49.881027639 +0100
+@@ -96,7 +96,7 @@
+ int
+ _Xaw_iswalnum(wchar_t ch)
+ {
+-    unsigned char mb[sizeof(wchar_t)];
++    unsigned char mb[MB_CUR_MAX];
+ 
+     wctomb((char*)mb, ch);
+ 
diff --git a/libXfont-1.2.6.tar.bz2 b/libXfont-1.2.6.tar.bz2
deleted file mode 100644
index e90c7cf..0000000
--- a/libXfont-1.2.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9337670709697046e5071d028fb0c72e0e8b01b6890e952b8bd1021d7cd4fe9a
-size 582191
diff --git a/libXfont-1.2.7.tar.bz2 b/libXfont-1.2.7.tar.bz2
new file mode 100644
index 0000000..3303543
--- /dev/null
+++ b/libXfont-1.2.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b
+size 573915
diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index 81d0ae3..812e7ce 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan 23 18:00:09 CET 2007 - sndirsch@suse.de
+
+- bug233919-libXaw.diff:
+  * fixes buffer overflow in xedit (Bug #233919) 
+
+-------------------------------------------------------------------
+Tue Jan 23 10:07:54 CET 2007 - sndirsch@suse.de
+
+- updated libXfont to release 1.2.7
+  * fontfile: accept empty (but valid) font paths (bug #3091)
+  * Add stubs for the scalable renderer callbacks.
+
 -------------------------------------------------------------------
 Fri Jan 12 00:34:03 CET 2007 - sndirsch@suse.de
 
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index 323d124..be1096b 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -19,7 +19,7 @@ Provides:       libXaw.so.8 libXaw.so.7 libXaw.so.6
 %endif
 URL:            http://xorg.freedesktop.org/
 Version:        7.2
-Release:        36
+Release:        37
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@@ -34,7 +34,7 @@ Source6:        libXcomposite-0.3.1.tar.bz2
 Source7:        libXcursor-1.1.8.tar.bz2
 Source8:        libXdamage-1.1.tar.bz2
 Source9:        libXevie-1.0.2.tar.bz2
-Source10:       libXfont-1.2.6.tar.bz2
+Source10:       libXfont-1.2.7.tar.bz2
 Source11:       libXfontcache-1.0.4.tar.bz2
 Source12:       libXft-2.1.12.tar.bz2
 Source13:       libXi-1.0.2.tar.bz2
@@ -61,6 +61,7 @@ Patch4:         p_xft_register.diff
 Patch5:         libxkbui.diff
 Patch6:         libXi-20061015090357.diff
 Patch7:         libXi-20061119100426.diff
+Patch8:         bug233919-libXaw.diff
 
 %description
 This package contains the remaining X.Org libraries.
@@ -143,6 +144,9 @@ pushd libXi-*
 %patch6 -p1
 %patch7 -p1
 popd
+pushd libXaw-*
+%patch8 -p0
+popd
 
 %build
 for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -208,6 +212,13 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog -n xorg-x11-libs
+* Tue Jan 23 2007 - sndirsch@suse.de
+- bug233919-libXaw.diff:
+  * fixes buffer overflow in xedit (Bug #233919)
+* Tue Jan 23 2007 - sndirsch@suse.de
+- updated libXfont to release 1.2.7
+  * fontfile: accept empty (but valid) font paths (bug #3091)
+  * Add stubs for the scalable renderer callbacks.
 * Fri Jan 12 2007 - sndirsch@suse.de
 - added libvnc/libXcliplist from xf4vnc project
 * Thu Jan 11 2007 - sndirsch@suse.de