diff --git a/gettext.spec b/gettext.spec
index 0b9e1c6..3d62653 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -1,10 +1,11 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.10.35
-Release: 23
+Release: 31
 License: GPL
 Group: Development/Tools
-Source: ftp://alpha.gnu.org/pub/gnu/%{name}-%{version}.tar.gz
+Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
+Source1: po-mode-init.el
 Patch0: gettext-0.10-misc.patch
 Patch1: gettext-0.10.35-jbj.patch
 Patch2: gettext-0.10.35-arm.patch
@@ -13,7 +14,9 @@ Patch4: gettext-0.10.35-aclocaldir.patch
 Patch5: gettext-0.10.35-buildroot.patch
 Patch6: gettext-0.10.35-destdir.patch
 Patch7: gettext-0.10.35-drepper.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Patch8: gettext-0.10.35-oka-plus.patch
+Prereq: /sbin/install-info
+Buildroot: %{_tmppath}/%{name}-%{version}-droot
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -27,9 +30,6 @@ library and tools for creating, using, and modifying natural language
 catalogs and is a powerful and simple method for internationalizing
 programs.
 
-If you would like to internationalize or incorporate multi-lingual
-messages into programs that you're developing, you should install
-gettext.
 
 %prep
 rm -rf %{buildroot}
@@ -42,12 +42,14 @@ rm -rf %{buildroot}
 %patch5 -p1 -b .buildroot
 %patch6 -p0
 %patch7 -p1
+%patch8 -p1 -b .oka
 
 %build
 libtoolize --copy --force
 aclocal
 automake
 autoconf
+export EMACS=emacs
 %configure --enable-shared --with-included-gettext
 make
 
@@ -57,6 +59,10 @@ rm -rf %{buildroot}
 # Fix busted no-emacs install for $lispdir/po-mode.el
 %makeinstall lispdir=%{buildroot}/usr/share/emacs/site-lisp \
     aclocaldir=%{buildroot}/usr/share/aclocal
+    
+mkdir -p %{buildroot}/bin
+mv %{buildroot}/%{_bindir}/gettext %{buildroot}/bin
+ln -s ../../bin/gettext %{buildroot}/%{_bindir}/gettext
 
 pushd %{buildroot}
 rm -f .%{_infodir}/dir .%{_includedir}/libintl.h
@@ -64,6 +70,17 @@ gzip -9nf .%{_infodir}/*
 strip .%{_bindir}/* || :
 popd
 
+pushd %{buildroot}/%{_datadir}/locale
+for foo in `find . -maxdepth 1 -mindepth 1 -type d` ; do
+  lang=`echo $foo | cut -c 3-`
+  echo "%lang($lang) %{_datadir}/locale/$foo/*/*" >> \
+    $RPM_BUILD_DIR/%{name}-%{version}/trans.list
+done
+popd
+
+mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
+
 %clean
 rm -rf %{buildroot}
 
@@ -76,16 +93,40 @@ if [ "$1" = 0 ]; then
 fi
 exit 0
 
-%files
+%files -f trans.list
 %defattr(-,root,root)
+/bin/*
 %{_bindir}/*
 %{_infodir}/*
 %{_datadir}/gettext
-%{_datadir}/locale/*/LC_MESSAGES/*
 %{_datadir}/aclocal/*
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Sun Feb 25 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+- Initialize proper fonts when entering po-mode (#29152)
+
+* Mon Feb 12 2001 Yukihiro Nakai <ynakai@redhat.com>
+- More fix about msgmerge.
+
+* Mon Feb 12 2001 Yukihiro Nakai <ynakai@redhat.com>
+- Fix for msgmerge not to break multibyte strings
+  at Japanese locale.
+
+* Wed Jan 24 2001 Matt Wilson <msw@redhat.com>
+- fixed the %lang generator to not have "./" in the lang
+
+* Sun Jan 14 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+- add an init file for the emacs po-mode
+- update source URL
+
+* Thu Jan 11 2001 Bill Nottingham <notting@redhat.com>
+- put gettext in /bin for initscripts use
+- %langify
+
+* Fri Dec 29 2000 Bill Nottingham <notting@redhat.com>
+- prereq /sbin/install-info
+
 * Wed Aug 23 2000 Trond Eivind Glomsr�d <teg@redhat.com>
 - Added patch from Ulrich Drepper
 
diff --git a/po-mode-init.el b/po-mode-init.el
new file mode 100644
index 0000000..63db02f
--- /dev/null
+++ b/po-mode-init.el
@@ -0,0 +1,12 @@
+;; Use po-mode for translation files
+
+(autoload 'po-mode "po-mode")
+(setq auto-mode-alist (cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode)
+                            auto-mode-alist))
+
+;;; To automatically use proper fonts under Emacs 20, also add:
+
+(autoload 'po-find-file-coding-system "po-mode")
+(modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\."
+                            'po-find-file-coding-system)
+