diff --git a/texinfo.spec b/texinfo.spec
index 52e3a43..e92c261 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -1,13 +1,16 @@
 Summary: Tools needed to create Texinfo format documentation files.
 Name: texinfo
 Version: 4.0
-Release: 15
+Release: 20
 License: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.gz
 Source1: info-dir
+Source2: info.desktop
 Patch1: texinfo-3.12h-fix.patch
+Patch2: texinfo-fileextension.patch
 Patch3: texinfo-4.0-zlib.patch
+Patch4: texinfo-4.0-danish.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -47,7 +50,9 @@ valuable source of information about the software on your system.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1 -b .ext
 %patch3 -p1 -b .zlib
+%patch4 -p1 -b .danish
 
 %build
 
@@ -55,7 +60,7 @@ valuable source of information about the software on your system.
 make 
 
 rm util/install-info
-make -C util LIBS=%{_prefix}/lib/libz.a
+make -C util LIBS=%{_libdir}/libz.a
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -73,20 +78,12 @@ mkdir -p ${RPM_BUILD_ROOT}/{etc,sbin}
   done
   mv -f .%{_prefix}/bin/install-info ./sbin
   mkdir -p ./etc/X11/applnk/Utilities
-cat > ./etc/X11/applnk/Utilities/info.desktop <<EOF
-[Desktop Entry]
-Name=Info Viewer
-Name[sv]=Infovisare
-Name[de]=Info-Viewer
-Type=Application
-Comment=GNU Info Page Reader
-Comment[sv]=GNU Info-sidläsare
-Comment[de]=GNU Info-Seiten-Viewer
-Exec=info
-Terminal=true
-EOF
+  install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/X11/applnk/Utilities
+
 )
 
+%find_lang %name
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -106,7 +103,7 @@ if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_prefix}/share/info/info-stnd.info.gz %{_prefix}/share/info/dir
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO
 %doc info/README
@@ -114,7 +111,6 @@ fi
 %{_prefix}/bin/texindex
 %{_prefix}/bin/texi2dvi
 %{_prefix}/share/info/texinfo*
-%{_prefix}/share/locale/*/*/*
 %{_prefix}/share/man/man1/makeinfo.1*
 %{_prefix}/share/man/man1/texindex.1*
 %{_prefix}/share/man/man1/texi2dvi.1*
@@ -134,6 +130,22 @@ fi
 %{_prefix}/share/man/man5/info.5*
 
 %changelog
+* Fri Feb 23 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- langify
+- don't create desktop file in spec file
+
+* Tue Jan 23 2001 Preston Brown <pbrown@redhat.com>
+- danish translation added
+
+* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- Rebuild to get rid of 0777 dirs
+
+* Wed Nov  8 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- Fix recognition of .?o extensions in texi2dvi, Bug #20498
+
+* Thu Sep  7 2000 Jeff Johnson <jbj@redhat.com>
+- FHS packaging (64bit systems need to use %%_libdir not /usr/lib).
+
 * Sat Aug 19 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - really do it - #16120