diff --git a/.gitignore b/.gitignore
index 7255ee6..071b074 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /Horde_Translation-1.0.1.tgz
 /Horde_Translation-1.0.2.tgz
+/Horde_Translation-2.0.0.tgz
+/Horde_Translation-2.0.1.tgz
diff --git a/php-horde-Horde-Translation.spec b/php-horde-Horde-Translation.spec
index f9e6f0c..86f993d 100644
--- a/php-horde-Horde-Translation.spec
+++ b/php-horde-Horde-Translation.spec
@@ -1,8 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %global pear_name Horde_Translation
 
 Name:           php-horde-Horde-Translation
-Version:        1.0.2
+Version:        2.0.1
 Release:        1%{?dist}
 Summary:        Horde translation library
 
@@ -19,7 +20,7 @@ Provides:       php-pear(pear.horde.org/Horde_Translation) = %{version}
 BuildRequires:  php-channel(pear.horde.org)
 BuildRequires:  gettext
 Requires:       php-channel(pear.horde.org)
-Requires:       php-common >= 5.2.0
+Requires:       php-common >= 5.3.0
 
 %description
 Translation wrappers.
@@ -50,14 +51,24 @@ rm -rf $RPM_BUILD_ROOT
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
-%find_lang %{pear_name}
-%find_lang Horde_Other
-cat Horde_Other.lang >> %{pear_name}.lang
+
+# Locales
+for loc in locale/{??,??_??}
+do
+    lang=$(basename $loc)
+    test -d $loc && echo "%%lang(${lang%_*}) %{pear_datadir}/%{pear_name}/$loc"
+done | tee ../%{pear_name}.lang
+# Locales
+for loc in locale/{??,??_??}
+do
+    lang=$(basename $loc)
+    test -d $loc && echo "%%lang(${lang%_*}) %{pear_datadir}/Horde_Other/$loc"
+done | tee ../%{pear_name}.lang
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
@@ -70,7 +81,7 @@ if [ $1 -eq 0 ] ; then
 fi
 
 
-%files -f %{pear_name}-%{version}/%{pear_name}.lang
+%files -f %{pear_name}.lang
 # own locales (non standard) directories, .mo own by find_lang
 %{pear_xmldir}/%{name}.xml
 %dir %{pear_phpdir}/Horde
@@ -85,9 +96,19 @@ fi
 %dir %{pear_testdir}/Horde_Translation/Horde/Translation/locale/de
 %dir %{pear_testdir}/Horde_Translation/Horde/Translation/locale/de/LC_MESSAGES
 %{pear_testdir}/Horde_Translation/Horde/Translation/*.php
+%{pear_testdir}/Horde_Translation/Horde/Translation/phpunit.xml
 
 
 %changelog
+* Wed Dec 12 2012 Nick Bebout <nb@fedoraproject.org> - 2.0.1-1
+- Update to 2.0.1
+
+* Tue Aug 14 2012 Remi Collet <remi@fedoraproject.org> - 1.0.2-3
+- rebuilt for new pear_testdir
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Thu Jun 14 2012 Nick Bebout <nb@fedoraproject.org> - 1.0.2-1
 - Upgrade to 1.0.2
 
diff --git a/sources b/sources
index f451c37..226d62c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1f4b7976524baec86c5efca5d8a5c62  Horde_Translation-1.0.2.tgz
+f60591bd89a777bd8fabdc4e19cba9c1  Horde_Translation-2.0.1.tgz