diff --git a/Xaw3d.spec b/Xaw3d.spec
index 495c16a..7e8b266 100644
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@@ -3,7 +3,7 @@
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
 Version: 1.5E
-Release: 4
+Release: 5
 Group: System Environment/Libraries
 Source: http://www.visi.com/~hawkeyed/X/Xaw3d-%{version}.tar.gz
 Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
@@ -22,7 +22,13 @@ Prefix: /usr
 Prereq: fileutils
 Prereq: /sbin/ldconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: xorg-x11-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXt-devel 
+BuildRequires: libSM-devel
+BuildRequires: libXext-devel
+BuildRequires: libX11-devel
+BuildRequires: libXpm-devel
+BuildRequires: imake 
 
 %description
 Xaw3d is an enhanced version of the MIT Athena Widget set for
@@ -37,7 +43,13 @@ those applications.
 Summary: Header files and static libraries for development using Xaw3d.
 Group: Development/Libraries
 Requires: %{name} = %{version}
-Requires: xorg-x11-devel
+Requires: libXmu-devel
+Requires: libXt-devel 
+Requires: libSM-devel
+Requires: libXext-devel
+Requires: libX11-devel
+Requires: libXpm-devel
+
 
 %description devel
 Xaw3d is an enhanced version of the MIT Athena widget set for
@@ -82,7 +94,6 @@ popd
 %build
 # Xaw3d7
 pushd xc/lib/Xaw3d
-export PATH=/usr/X11R6/bin:$PATH
 xmkmf
 make CDEBUGFLAGS="${RPM_OPT_FLAGS} -DARROW_SCROLLBAR"
 popd
@@ -142,6 +153,10 @@ fi
 %ghost /usr/X11R6/include/Xaw3d
 
 %changelog
+* Tue Nov 05 2005 Warren Togami <wtogami@redhat.com> 1.5E-5
+- req individual X dependencies
+- remove X11R6 references
+
 * Thu Mar 03 2005 Than Ngo <than@redhat.com> 1.5E-4
 - rebuilt