diff --git a/xaw3d-config.patch b/xaw3d-config.patch
new file mode 100644
index 0000000..01510ac
--- /dev/null
+++ b/xaw3d-config.patch
@@ -0,0 +1,23 @@
+--- configure.ac
++++ configure.ac
+@@ -4236,17 +4236,17 @@ if test "$with_x11" = "yes" -a "$detect_
+     AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb,
+       [
+         dnl Must not be a 3d library...
+-        AC_CHECK_LIB($athena_variant, threeDClassRec,
++        AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB,
+           [AC_MSG_WARN([Could not find a non-3d Athena widget library.])],
+           athena_lib=$athena_variant)
+       ],
+       AC_MSG_WARN([Could not find an Athena widget library.]))
+   else
+     dnl The real configuration, need 3d library
+-    AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant,
++    AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant,
+       dnl OK, couldn't find it with a proper name, try the standard Athena lib
+       dnl If that is 3d, presume the user asked for what they have installed.
+-      AC_CHECK_LIB(Xaw, threeDClassRec,
++      AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB,
+         [
+           athena_lib=Xaw;
+           AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
diff --git a/xemacs.changes b/xemacs.changes
index a01a460..35ec1ef 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 12 16:35:16 CET 2008 - schwab@suse.de
+
+- Fix configure check for Xaw3d.
+
 -------------------------------------------------------------------
 Mon Feb 04 22:16:40 CET 2008 - mfabian@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index 141b25a..8e03bd6 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -8,7 +8,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
+
 
 Name:           xemacs
 BuildRequires:  canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel gpm krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xorg-x11 xorg-x11-devel
@@ -37,7 +37,7 @@ Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 AutoReqProv:    on
 Version:        21.5.28.20080119
-Release:        8
+Release:        22
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -85,6 +85,7 @@ Patch42:        build-fix-ccl-load-problem.patch
 Patch43:        set-language-unicode-precedence-list.patch
 Patch45:        fix-defface-custom-modified-face.patch
 Patch46:        byte-comp-problem.patch
+Patch47:        xaw3d-config.patch
 Patch292811:    bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
 Patch301352:    bugzilla-301352-fix-wrong-incrementing-in-macros.patch
 Patch358333:    bugzilla-358333-kde-font-lock-problem.patch
@@ -176,6 +177,7 @@ Authors:
 %patch43 -p1
 %patch45 -p0
 %patch46 -p1
+%patch47
 %patch292811 -p1
 %patch301352 -p1
 %patch358333 -p1
@@ -581,6 +583,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Wed Mar 12 2008 schwab@suse.de
+- Fix configure check for Xaw3d.
 * Mon Feb 04 2008 mfabian@suse.de
 - bnc#358333: fix bugs in font-lock-add-keywords and
   font-lock-remove-keywords which caused severe problems when