diff --git a/transfig.spec b/transfig.spec
index 4e5ed8d..739d59c 100644
--- a/transfig.spec
+++ b/transfig.spec
@@ -1,10 +1,11 @@
-%define xfig_libdir /usr/X11R6/lib/X11/xfig
-%define fig2dev_libdir /usr/share/fig2dev
+%define xfig_libdir %{_datadir}/xfig
+%define fig2dev_libdir %{_datadir}/fig2dev
+%define imake %(which imake)
 
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.4
-Release: 11
+Release: 12
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
@@ -16,11 +17,11 @@ Patch2: transfig.3.2.4-broken.patch
 Patch3: transfig-3.2.4-badc.patch
 Patch4: transfig.3.2.4-rgb.patch
 
-BuildPrereq: libpng-devel
-BuildPrereq: libjpeg-devel
-BuildPrereq: XFree86-devel
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-devel
+BuildRequires: %{imake}
 
-Buildroot: %{_tmppath}/transfig-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 The transfig utility creates a makefile which translates FIG (created
@@ -41,10 +42,8 @@ figures into certain graphics languages.
 %patch4 -p1 -b .rgb
 
 %build
-PATH=$PATH:/usr/X11R6/bin
 xmkmf
 make Makefiles XFIGLIBDIR=%{xfig_libdir} FIG2DEV_LIBDIR=%{fig2dev_libdir}
-
 make XFIGLIBDIR=%{xfig_libdir} FIG2DEV_LIBDIR=%{fig2dev_libdir}
 
 %install
@@ -82,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xfig_libdir}
 
 %changelog
+* Tue Nov 15 2005 Than Ngo <than@redhat.com> 1:3.2.4-12
+- fix for modular X 
+
 * Sat Mar 05 2005 Than Ngo <than@redhat.com> 1:3.2.4-11
 - rebuild