diff --git a/texinfo.spec b/texinfo.spec
index aace552..b4354df 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files.
 Name: texinfo
 Version: 4.2
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2
@@ -50,7 +50,7 @@ browser program for viewing texinfo files.
 
 %build
 
-%configure --mandir=%{_prefix}/share/man --infodir=%{_prefix}/share/info
+%configure
 make 
 
 rm util/install-info
@@ -63,14 +63,14 @@ mkdir -p ${RPM_BUILD_ROOT}/{etc,sbin}
 %makeinstall
 
 ( cd ${RPM_BUILD_ROOT}
-  gzip -n -9f .%{_prefix}/share/info/*info*
+  gzip -n -9f .%{_infodir}/*info*
   gzip -n -9f .%{_mandir}/*/*
   install -m644 $RPM_SOURCE_DIR/info-dir ./etc/info-dir
-  ln -sf /etc/info-dir ${RPM_BUILD_ROOT}%{_prefix}/share/info/dir
+  ln -sf /etc/info-dir ${RPM_BUILD_ROOT}%{_infodir}/dir
   for i in makeinfo texindex info install-info ; do
-    strip .%{_prefix}/bin/$i
+    strip .%{_bindir}/$i
   done
-  mv -f .%{_prefix}/bin/install-info ./sbin
+  mv -f .%{_bindir}/install-info ./sbin
 )
 
 %find_lang %name
@@ -79,48 +79,52 @@ mkdir -p ${RPM_BUILD_ROOT}/{etc,sbin}
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_prefix}/share/info/texinfo.gz %{_prefix}/share/info/dir
+/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_prefix}/share/info/texinfo.gz %{_prefix}/share/info/dir
+    /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir
 fi
 
 %post -n info
-/sbin/install-info %{_prefix}/share/info/info-stnd.info.gz %{_prefix}/share/info/dir
+/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir
 
 %preun -n info
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_prefix}/share/info/info-stnd.info.gz %{_prefix}/share/info/dir
+    /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir
 fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO
 %doc info/README
-%{_prefix}/bin/makeinfo
-%{_prefix}/bin/texindex
-%{_prefix}/bin/texi2dvi
-%{_prefix}/share/info/texinfo*
-%{_prefix}/share/man/man1/makeinfo.1*
-%{_prefix}/share/man/man1/texindex.1*
-%{_prefix}/share/man/man1/texi2dvi.1*
-%{_prefix}/share/man/man5/texinfo.5*
+%{_bindir}/makeinfo
+%{_bindir}/texindex
+%{_bindir}/texi2dvi
+%{_infodir}/texinfo*
+%{_mandir}/man1/makeinfo.1*
+%{_mandir}/man1/texindex.1*
+%{_mandir}/man1/texi2dvi.1*
+%{_mandir}/man5/texinfo.5*
 
 %files -n info
 %defattr(-,root,root)
 #%config(missingok) /etc/X11/applnk/Utilities/info.desktop
 %config(noreplace) %verify(not md5 size mtime) /etc/info-dir
-%config(noreplace) %{_prefix}/share/info/dir
-%{_prefix}/bin/info
-%{_prefix}/share/info/info.info*
-%{_prefix}/share/info/info-stnd.info*
+%config(noreplace) %{_infodir}/dir
+%{_bindir}/info
+%{_bindir}/infokey
+%{_infodir}/info.info*
+%{_infodir}/info-stnd.info*
 /sbin/install-info
-%{_prefix}/share/man/man1/info.1*
-%{_prefix}/share/man/man1/install-info.1*
-%{_prefix}/share/man/man5/info.5*
+%{_mandir}/man1/info.1*
+%{_mandir}/man1/install-info.1*
+%{_mandir}/man5/info.5*
 
 %changelog
+* Tue Jul  2 2002 Bernhard Rosenkraenzer <bero@redhat.com> 4.2-4
+- Add infokey (#67728)
+
 * Fri Jun 21 2002 Tim Powers <timp@redhat.com>
 - automated rebuild