diff --git a/gramps.spec.in b/gramps.spec.in
index c87c77701..c86876aa3 100644
--- a/gramps.spec.in
+++ b/gramps.spec.in
@@ -1,6 +1,11 @@
 %define ver      @VERSION@
 %define rel      @RELEASE@
 %define prefix   /usr
+%define localstatedir /var/lib
+# Ensure that internal RPM macros for %configure & %makeinstall 
+# will expand properly
+%define _prefix   %prefix
+%define _localstatedir %localstatedir
 
 Summary: Genealogical Research and Analysis Management Programming System.
 Name: gramps
@@ -11,7 +16,7 @@ Group: Applications/Genealogy
 Source: http://download.sourceforge.net/gramps/gramps-%{ver}.tar.gz
 BuildRoot: /var/tmp/%{name}-%{version}-root
 
-URL: http://gramps.sourceforge.net
+URL: http://gramps.sourceforge.net/
 
 Requires: python >= 2.2
 Requires: gnome-python2 >= 1.99
@@ -34,65 +39,57 @@ based plugin system.
 
 %build
 if [ ! -f configure ]; then
-  CFLAGS="$MYCFLAGS" ./autogen.sh $MYARCH_FLAGS --prefix=%prefix
+  CFLAGS="$MYCFLAGS" ./autogen.sh $MYARCH_FLAGS --prefix=%prefix \
+    --localstatedir=%localstatedir --bindir=%{_bindir} \
+    --mandir=%{_mandir} --libdir=%{_libdir} --datadir=%{_datadir} \
+    --includedir=%{_includedir} --sysconfdir=%{_sysconfdir}
 else
-  CFLAGS="$MYCFLAGS" ./configure $MYARCH_FLAGS --prefix=%prefix
+  CFLAGS="$MYCFLAGS" %configure
 fi
 
-make
-
+CFLAGS="$RPM_OPT_FLAGS" make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make GNOME_DATADIR=$RPM_BUILD_ROOT%{prefix}/share prefix=$RPM_BUILD_ROOT%{prefix} install
+%makeinstall
+%find_lang gramps
+rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f gramps.lang
 %defattr(-, root, root)
 
 %doc README COPYING TODO INSTALL COPYING-DOCS
+%doc %{_mandir}/man1/*
+%doc %{_datadir}/gnome/help/*
 
 %{prefix}/bin/gramps
 
-%{_datadir}/gramps/gnome/help/gramps/C/*
 %{_datadir}/gnome/apps/Applications/gramps.desktop
 %{_datadir}/pixmaps/gramps.png
-%{_datadir}/locale/*/LC_MESSAGES/gramps.mo
 
-%{_datadir}/gramps/*.xpm
-%{_datadir}/gramps/*.jpg
-%{_datadir}/gramps/gramps.desktop
-%{_datadir}/gramps/*.png
-%{_datadir}/gramps/*.py
-%{_datadir}/gramps/*.pyo
-%{_datadir}/gramps/*.glade
-%{_datadir}/gramps/*.so
-%{_datadir}/gramps/docgen/*.py
-%{_datadir}/gramps/docgen/*.pyo
-%{_datadir}/gramps/filters/*.py
-%{_datadir}/gramps/filters/*.pyo
-%{_datadir}/gramps/plugins/*.py
-%{_datadir}/gramps/plugins/*.pyo
-%{_datadir}/gramps/plugins/*.glade
-%{_datadir}/gramps/data/gedcom.xml
-%{_datadir}/gramps/data/templates/*.tpkg
-%{_datadir}/gramps/data/templates/*.xml
-%{_datadir}/gramps/example/*
+%{_datadir}/gramps/*
 %{_datadir}/omf/gramps
 
-%{prefix}/man/man1/gramps.1*
-
-
 %post
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q -o %{_datadir}/omf/gramps; fi
+if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %postun
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q; fi
+if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
  
 %changelog
+* Mon May 20 2003 Donald Peterson <dpeterson@sigmaxi.org>
+- Override RPMs default of localstatedir to /var/lib..
+  This is done in accordance with GNOME and FHS compliance guidelines 
+  (http://fedora.mplug.org/docs/rpm-packaging-guidelines.html)
+- Use %find_lang macro to get NLS files
+- Set %doc tags on appropriate files
+- Remove temporary scrollkeeper-created files from install before packaging
+  to avoid rpm 4.1 complaints.  (These aren't needed in the distribution.)
+- Use default scrollkeeper-update scripts
 * Mon Mar 24 2003 Alex Roitman <shura@alex.neuro.umn.edu>
 - update scrollkeeper dependencies and add post and postun to enable install on a machine without scrollkeeper
 * Fri Jun 14 2002 Donald Peterson <dpeterso@engr.ors.edu>