diff --git a/gettext.spec b/gettext.spec
index e99c5d9..5893b9f 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -3,7 +3,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.14.1
-Release: 7
+Release: 8
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -15,7 +15,7 @@ Prereq: /sbin/install-info
 %ifarch x86_64 ppc64 s390x
 BuildRequires: automake >= 1.8, autoconf >= 2.5
 %endif
-BuildRequires: libtool, bison
+BuildRequires: libtool, bison, gcc-c++
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -107,14 +107,32 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/preloadable_libintl.so
 rm -rf %{buildroot}
 
 %post
-/sbin/install-info %{_infodir}/gettext.info.gz %{_infodir}/dir
+/sbin/ldconfig
+%_install_info %{_infodir}/gettext.info.gz
 
 %preun
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/gettext.info.gz %{_infodir}/dir
+    %_remove_install_info %{_infodir}/gettext.info.gz
 fi
 exit 0
 
+%postun
+/sbin/ldconfig
+
+
+%post devel
+/sbin/ldconfig
+%_install_info autosprintf.info
+
+%preun devel
+if [ "$1" = 0]; then
+    %_remove_install_info autosprintf.info
+fi
+
+%postun devel
+/sbin/ldconfig
+
+
 %files -f trans.list
 %defattr(-,root,root)
 %doc gettext-runtime/ABOUT-NLS AUTHORS gettext-runtime/BUGS
@@ -138,7 +156,7 @@ exit 0
 %{_mandir}/*/*
 #%config %{_libdir}/charset.alias
 %{_libdir}/%{name}
-
+%exclude %{_libdir}/%{name}/gnu.gettext.*
 
 %files devel
 %defattr(-,root,root)
@@ -161,9 +179,15 @@ exit 0
 %{_libdir}/libasprintf.so*
 %{_libdir}/libgettextpo.so*
 %{_mandir}/man3/*
-
+%doc gettext-runtime/intl-java/javadoc*
+%{_libdir}/%{name}/gnu.gettext.*
 
 %changelog
+* Mon Sep 13 2004 Leon Ho <llch@redhat.com>
+- move java stuff to gettext-devel (#132239)
+- add BuildRequires: gcc-c++ (#132518)
+- add some missing install-info and ldconfig (#131272)
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt