diff --git a/evolution.spec b/evolution.spec
index 8a266da..ade784d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -112,11 +112,11 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: libgnomecanvas-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libgweather-devel >= %{libgweather_version}
-BuildRequires: libpst-devel
+#BuildRequires: libpst-devel
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool >= 1.5
 BuildRequires: libxml2-devel
-BuildRequires: libytnef-devel
+#BuildRequires: libytnef-devel
 BuildRequires: pkgconfig
 
 %if %{use_mozilla_nss}
@@ -313,9 +313,9 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE
 cd po
 grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
-intltool-update --pot
+intltool-update --gettext-package=%{name}-%{evo-major} --pot
 for p in *.po; do
-	msgmerge $p evolution-%{evo_major}.pot > $p.out
+	msgmerge $p %{name}-%{evo_major}.pot > $p.out
 	msgfmt -o `basename $p .po`.gmo $p.out
 done
 cd -
@@ -680,6 +680,8 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jul 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.3-4.fc12
 - Add BR for libpst-devel and libytnef-devel (RH bug #493049).
 - Add patch to build pst-import plugin against current libpst.
+- libpst's API broke again so disable the BR's for now.
+- Specify the gettext package when calling intltool-update.
 
 * Wed Jul 01 2009 Milan Crha <mcrha@redhat.com> - 2.27.3-3.fc12
 - Rebuild against newer gcc