diff --git a/.cvsignore b/.cvsignore
index b4bdcbc..80db7c3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-gettext-0.14.1.tar.gz
-gettext-0.14.3.tar.gz
-gettext-0.14.5.tar.gz
+gettext-0.14.6.tar.gz
diff --git a/gettext.spec b/gettext.spec
index 000800a..dbb5af2 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -1,25 +1,19 @@
-%define libtoolize :
-%define install_info /sbin/install-info
-%define remove_install_info /sbin/install-info --delete
-
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
-Version: 0.14.5
-Release: 4
+Version: 0.14.6
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 URL: http://www.gnu.org/software/gettext/
 Source1: po-mode-init.el
 Source2: msghack.py
-Patch1: gettext-0.14.3-gcc4.patch
-#Patch2: gettext-0.14.1-tempfile.patch
 Prereq: /sbin/install-info
 %ifarch x86_64 ppc64 s390x
 BuildRequires: automake >= 1.8, autoconf >= 2.5
 %endif
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
-BuildRequires: /usr/bin/fastjar
+BuildRequires: %{_bindir}/fastjar
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -34,29 +28,29 @@ library and tools for creating, using, and modifying natural language
 catalogs and is a powerful and simple method for internationalizing
 programs.
 
-%package	devel
-Summary:	Development files for %{name}
-Group:      Development/Tools
-License:	LGPL
-Requires:	%{name} = %{version}-%{release}
-Requires:	cvs
-Provides:	devel(libintl)
-Prereq:		/sbin/install-info
 
-%description	devel
+%package devel
+Summary: Development files for %{name}
+Group: Development/Tools
+License: LGPL
+Requires: %{name} = %{version}-%{release}
+Requires: cvs
+Provides: devel(libintl)
+PreReq: /sbin/install-info
+
+%description devel
 This package contains all development related files necessary for
 developing or compiling applications/libraries that needs
 internationalization capability. You also need this package if you
 want to add gettext support for your project.
 
+
 %prep
-rm -rf %{buildroot}
 %setup -q
-%patch1 -p1 -b .gcc4
-#%patch2 -p1 -b .tempfile
+
 
 %build
-[ -f  /usr/share/automake/depcomp ] && cp -f /usr/share/automake/{depcomp,ylwrap} . || :
+[ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} . || :
 
 # Rerun autotools for new version
 #    aclocal --force
@@ -82,21 +76,21 @@ export JAR='fastjar'
 	--enable-shared --with-pic-=yes --disable-csharp
 make
 
+
 %install
 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
+%makeinstall lispdir=${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp \
+    aclocaldir=${RPM_BUILD_ROOT}%{_datadir}/aclocal
     
-mkdir -p %{buildroot}/bin
-mv %{buildroot}/%{_bindir}/gettext %{buildroot}/bin
-ln -s ../../bin/gettext %{buildroot}/%{_bindir}/gettext
-install -m 755 %SOURCE2 $RPM_BUILD_ROOT/%{_bindir}/msghack
+# move gettext to /bin
+mkdir -p ${RPM_BUILD_ROOT}/bin
+mv ${RPM_BUILD_ROOT}%{_bindir}/gettext ${RPM_BUILD_ROOT}/bin
+ln -s ../../bin/gettext ${RPM_BUILD_ROOT}%{_bindir}/gettext
 
-pushd %{buildroot}
-rm -f .%{_infodir}/dir .%{_includedir}/libintl.h
-popd
+install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
+
+rm ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 pushd %{buildroot}/%{_datadir}/locale
 for foo in `find . -maxdepth 1 -mindepth 1 -type d` ; do
@@ -106,42 +100,47 @@ for foo in `find . -maxdepth 1 -mindepth 1 -type d` ; do
 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
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
+install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
 
 # doc relocations
 for i in gettext-runtime/man/*.html; do
-  rm -f $RPM_BUILD_ROOT%{_datadir}/doc/gettext/`basename $i`
+  rm ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/`basename $i`
 done
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gettext/javadoc*
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/javadoc*
 
 rm -rf htmldoc examples
 mkdir htmldoc
-mv $RPM_BUILD_ROOT%{_datadir}/doc/gettext/examples examples
-mv $RPM_BUILD_ROOT%{_datadir}/doc/gettext/* $RPM_BUILD_ROOT/%{_datadir}/doc/libasprintf/* htmldoc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libasprintf
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gettext
-
+mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/examples examples
+mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}/%{_datadir}/doc/libasprintf/* htmldoc
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
 
 # remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT/usr/doc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
-rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
-rm -rf $RPM_BUILD_ROOT%{_libdir}/preloadable_libintl.so
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/emacs
+rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf ${RPM_BUILD_ROOT}
+
+
+%define install_info /sbin/install-info
+%define remove_install_info /sbin/install-info --delete
+
 
 %post
 /sbin/ldconfig
 %{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir
 
+
 %preun
 if [ "$1" = 0 ]; then
     %{remove_install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir
 fi
 exit 0
 
+
 %postun
 /sbin/ldconfig
 
@@ -150,11 +149,13 @@ exit 0
 /sbin/ldconfig
 %{install_info} %{_infodir}/autosprintf.info %{_infodir}/dir
 
+
 %preun devel
 if [ "$1" = 0 ]; then
     %{remove_install_info} %{_infodir}/autosprintf.info %{_infodir}/dir
 fi
 
+
 %postun devel
 /sbin/ldconfig
 
@@ -167,18 +168,19 @@ fi
 %doc gettext-runtime/man/*.1.html
 %doc gettext-runtime/intl/COPYING*
 /bin/*
-/usr/bin/*
+%{_bindir}/*
 %exclude %{_bindir}/autopoint
 %exclude %{_bindir}/gettextize
 
 # These aren't in glibc...
-%dir /usr/share/locale/en@boldquot
-%dir /usr/share/locale/en@boldquot/LC_MESSAGES
-%dir /usr/share/locale/en@quot
-%dir /usr/share/locale/en@quot/LC_MESSAGES
+%dir %{_datadir}/locale/en@boldquot
+%dir %{_datadir}/locale/en@boldquot/LC_MESSAGES
+%dir %{_datadir}/locale/en@quot
+%dir %{_datadir}/locale/en@quot/LC_MESSAGES
 
 %{_libdir}/libgettextlib*.so
 %{_libdir}/libgettextsrc*.so
+%{_libdir}/preloadable_libintl.so
 %{_infodir}/gettext*
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/gettextize.1.gz
@@ -207,7 +209,6 @@ fi
 %{_includedir}/*
 %{_infodir}/autosprintf*
 %{_libdir}/lib*.a
-%{_libdir}/lib*.la
 %{_libdir}/libasprintf.so*
 %{_libdir}/libgettextpo.so*
 %{_mandir}/man1/gettextize.1.gz
@@ -217,7 +218,14 @@ fi
 %doc gettext-runtime/intl-java/javadoc*
 %{_libdir}/%{name}/gnu.gettext.*
 
+
 %changelog
+* Mon Aug  7 2006 Jens Petersen <petersen@redhat.com> - 0.14.6-1
+- update to 0.14.6
+- include preloadable_libintl.so again (Roozbeh Pournader, #149809)
+- remove .la files (Kjartan Maraas, #172624)
+- cleanup spec file
+
 * Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim@redhat.com> - 0.14.5-4
 - Bump release number.
 
@@ -260,7 +268,7 @@ fi
 
 * Wed Dec 01 2004 Leon Ho <llch@redhat.com>
 - Add env var to redirect use fastjar instead of jar
-- BuildRequires /usr/bin/fastjar and libgcj
+- BuildRequires %{_bindir}/fastjar and libgcj
 
 * Mon Nov 01 2004 Leon Ho <llch@redhat.com>
 - fix call on phase0_getc()
diff --git a/po-mode-init.el b/po-mode-init.el
index 63db02f..961a3ac 100644
--- a/po-mode-init.el
+++ b/po-mode-init.el
@@ -1,11 +1,10 @@
-;; Use po-mode for translation files
+;;; po-mode-init.el
 
 (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:
-
+;; autodetect coding-system
 (autoload 'po-find-file-coding-system "po-mode")
 (modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\."
                             'po-find-file-coding-system)
diff --git a/sources b/sources
index 0491a6a..f76d259 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2f6581626a22a0de66dce1d81d00de3  gettext-0.14.5.tar.gz
+c26fc7f0a493c5c7c39bbc4e7ed42790  gettext-0.14.6.tar.gz