diff --git a/.cvsignore b/.cvsignore
index 4db4004..0c77aa3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xsane-0.61.tar.gz
+xsane-0.62.tar.gz
diff --git a/sources b/sources
index e207431..610de00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1464d82315c15deb5f4f3d9d392d6285  xsane-0.61.tar.gz
+933c315ac2cda571b9720be1f77a813b  xsane-0.62.tar.gz
diff --git a/xsane.spec b/xsane.spec
index 83192e9..21d049a 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -1,7 +1,7 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
-Version: 0.61
-Release: 3
+Version: 0.62
+Release: 4
 Source: %{name}-%{version}.tar.gz
 License: GPL
 URL: http://www.wolfsburg.de/~rauch/sane/sane-xsane.html
@@ -20,6 +20,7 @@ performing the scan and then manipulating the captured image.
 Summary: A GIMP plugin which provides a scanner interface.
 Group: Applications/Multimedia
 Requires: sane >= 1.0
+Prereq: /usr/bin/gimp-config /usr/bin/awk sh-utils fileutils
 
 %description gimp
 This package is the same as the regular XSane program, but it works as
@@ -31,14 +32,15 @@ rm -rf $RPM_BUILD_ROOT
 %setup -q
 
 %build
+%{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
 %configure --with-install-root=%{buildroot}
-make CXXFLAGS="$RPM_OPT_FLAGS"
+make
 
 mv src/xsane src/xsane-gimp
 
 make clean
 %configure --with-install-root=%{buildroot} --disable-gimp
-make CXXFLAGS="$RPM_OPT_FLAGS"
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,14 +77,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/xsane-gimp
 
 %post gimp
-if [ -d /usr/lib/gimp/1.1 ]; then
-  if [ ! -s /usr/lib/gimp/1.1/plug-ins/xsane ]; then
-    ln -s ../../../../bin/xsane-gimp /usr/lib/gimp/1.1/plug-ins/xsane
-  fi
-elif [ -d /usr/lib/gimp/1.0 ]; then
-  if [ ! -s /usr/lib/gimp/1.0/plug-ins/xsane ]; then
-    ln -s ../../../../bin/xsane-gimp /usr/lib/gimp/1.0/plug-ins/xsane
-  fi
+GIMPPLUGINDIR=`/usr/bin/gimp-config --gimpplugindir`
+if [ -z "$GIMPPLUGINDIR" ]; then
+  GIMPPLUGINDIR=/usr/lib/gimp/1.2
+fi
+RELPATH=`echo $GIMPPLUGINDIR | awk '
+  BEGIN { FS="/"; i = 1} {while (i < NF) { printf("../"); i = i + 1} }'`
+if [ ! -s $GIMPPLUGINDIR/plug-ins/xsane ]; then
+  ln -s $RELPATH/bin/xsane-gimp $GIMPPLUGINDIR/plug-ins/xsane
 fi
 
 
@@ -93,6 +95,19 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Mon Jan  8 2001 Matt Wilson <msw@redhat.com>
+- fix post script of gimp subpackage to install into the correct location
+
+* Mon Dec 25 2000 Matt Wilson <msw@redhat.com>
+- rebuilt against gimp 1.2.0
+
+* Thu Dec 21 2000 Matt Wilson <msw@redhat.com>
+- rebuilt against gimp 1.1.32
+- use -DGIMP_ENABLE_COMPAT_CRUFT=1 to build with compat macros
+
+* Thu Oct 12 2000 Than Ngo <than@redhat.com>
+- 0.62
+
 * Wed Aug 23 2000 Matt Wilson <msw@redhat.com>
 - rebuilt against gimp-1.1.25