diff --git a/transfig.spec b/transfig.spec
index 8f0deb8..c43112b 100644
--- a/transfig.spec
+++ b/transfig.spec
@@ -1,7 +1,9 @@
+%define xfig_libdir /usr/X11R6/lib/X11/xfig
+%define fig2dev_libdir /usr/share/fig2dev
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.3d
-Release: 2
+Release: 6
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
@@ -27,34 +29,31 @@ figures into certain graphics languages.
 %build
 PATH=$PATH:/usr/X11R6/bin
 xmkmf
-make Makefiles \
-     XFIGLIBDIR=/usr/X11R6/lib/X11/xfig \
-     FIG2DEV_LIBDIR=/usr/X11R6/lib/X11/fig2dev
+make Makefiles XFIGLIBDIR=%{xfig_libdir} FIG2DEV_LIBDIR=%{fig2dev_libdir}
 
+make \
 %ifarch alpha
-make EXTRA_DEFINES="-Dcfree=free" XFIGLIBDIR=/usr/X11R6/lib/X11/xfig \
-     FIG2DEV_LIBDIR=/usr/X11R6/lib/X11/fig2dev
-%else
-make XFIGLIBDIR=/usr/X11R6/lib/X11/xfig FIG2DEV_LIBDIR=/usr/X11R6/lib/X11/fig2dev
+EXTRA_DEFINES="-Dcfree=free" \
 %endif
+XFIGLIBDIR=%{xfig_libdir} FIG2DEV_LIBDIR=%{fig2dev_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fig2dev
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xfig
-make BINDIR=$RPM_BUILD_ROOT/usr/X11R6/bin install \
-    FIG2DEV_LIBDIR=$RPM_BUILD_ROOT/usr/X11R6/lib/X11/fig2dev \
-    XFIGLIBDIR=$RPM_BUILD_ROOT/usr/X11R6/lib/X11/xfig
-make MANSOURCEPATH=$RPM_BUILD_ROOT/usr/X11R6/man/man install.man \
-    FIG2DEV_LIBDIR=$RPM_BUILD_ROOT/usr/X11R6/lib/X11/fig2dev \
-    XFIGLIBDIR=$RPM_BUILD_ROOT/usr/X11R6/lib/X11/xfig \
-    DOCDIR=$RPM_BUILD_ROOT/doc
+mkdir -p $RPM_BUILD_ROOT%{fig2dev_libdir} \
+         $RPM_BUILD_ROOT%{xfig_libdir}
+
+make BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+     FIG2DEV_LIBDIR=$RPM_BUILD_ROOT%{fig2dev_libdir} \
+     XFIGLIBDIR=$RPM_BUILD_ROOT%{xfig_libdir} \
+     MANSOURCEPATH=$RPM_BUILD_ROOT%{_mandir}/man \
+     DOCDIR=$RPM_BUILD_ROOT/%{_docdir} \
+     install install.man
 
 # Dunno why these are not installed
 for i in fig2ps2tex fig2ps2tex.sh pic2tpic
 do
-	install -c -m 755 fig2dev/$i.script $RPM_BUILD_ROOT/usr/X11R6/bin/$i
+	install -c -m 755 fig2dev/$i.script $RPM_BUILD_ROOT%{_bindir}/$i
 done
 
 %clean
@@ -63,16 +62,28 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc CHANGES NOTES README LATEX.AND.XFIG
-/usr/X11R6/bin/transfig
-/usr/X11R6/bin/fig2dev
-/usr/X11R6/bin/fig2ps2tex
-/usr/X11R6/bin/fig2ps2tex.sh
-/usr/X11R6/bin/pic2tpic
-/usr/X11R6/man/man1/*
-/usr/X11R6/lib/X11/fig2dev
-/usr/X11R6/lib/X11/xfig
+%{_bindir}/transfig
+%{_bindir}/fig2dev
+%{_bindir}/fig2ps2tex
+%{_bindir}/fig2ps2tex.sh
+%{_bindir}/pic2tpic
+%{_mandir}/man1/*
+%{fig2dev_libdir}
+%{xfig_libdir}
 
 %changelog
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Fri Jun 14 2002 han Ngo <than@redhat.com> 3.2.3d-5
+- fhs fixes (bug #66732)
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
 * Mon Jul 23 2001 Than Ngo <than@redhat.com>
 - fix build dependencies (bug #49725)
 - Copyright -> License