diff --git a/.cvsignore b/.cvsignore
index c1780f2..a1b5b4a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sssd-0.6.1.tar.gz
+sssd-0.7.0.tar.gz
diff --git a/sources b/sources
index 5f962ee..c51859b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2deb5f1506ae2e172c9ce1de45c1d1df  sssd-0.6.1.tar.gz
+403945c70c902302e5d8babecb24b096  sssd-0.7.0.tar.gz
diff --git a/sssd.spec b/sssd.spec
index 1ec868a..8501d9f 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -1,12 +1,11 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib(1))")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.6.1
-Release: 2%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
-
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
 License: GPLv3+ and LGPLv3+
 URL: http://fedorahosted.org/sssd
@@ -16,14 +15,11 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
 
-Patch1: 0001-Tighten-up-permission.patch
-
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
-
-Requires: sssd-client = 0.6.1
+Requires: sssd-client = 0.7.0
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -77,8 +73,6 @@ service.
 %prep
 %setup -q
 
-%patch1 -p1 -b .tighten_permission
-
 %build
 %configure \
     --without-tests \
@@ -94,6 +88,16 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Prepare language files
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_daemon
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
+install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+
+install -m400 server/config/etc/sssd.api.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.conf
+install -m400 server/config/etc/sssd.api.d/* $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d/
+
 # Remove .la files created by libtool
 rm -f \
     $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \
@@ -105,23 +109,17 @@ rm -f \
     $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \
     $RPM_BUILD_ROOT/%{python_sitearch}/pysss.la
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d
-install -m400 server/config/etc/sssd.api.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.conf
-install -m400 server/config/etc/sssd.api.d/* $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d/
-
-touch locator.filelist
 if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
 then
-    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so > locator.filelist
+    # Apppend this file to the sss_daemon.lang
+    # Older versions of rpmbuild can only handle one -f option
+    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang
 fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f locator.filelist
+%files -f sss_daemon.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %attr(755,root,root) %{_initrddir}/%{name}
@@ -146,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
 %config %{_sysconfdir}/sssd/sssd.api.d/
 %{_mandir}/man5/sssd.conf.5*
+%{_mandir}/man5/sssd-ipa.5*
 %{_mandir}/man5/sssd-krb5.5*
 %{_mandir}/man5/sssd-ldap.5*
 %{_mandir}/man8/sssd.8*
@@ -156,13 +155,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sss_userdel.8*
 %{_mandir}/man8/sss_usermod.8*
 %{_mandir}/man8/sssd_krb5_locator_plugin.8*
-%{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
-%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
 %{python_sitearch}/pysss.so
 %{python_sitelib}/*.py*
 %{?fedora:%{python_sitelib}/*.egg-info}
 
-%files client
+%files client -f sss_client.lang
 %defattr(-,root,root,-)
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so
@@ -188,7 +185,14 @@ if [ $1 -ge 1 ] ; then
     /sbin/service %{servicename} condrestart 2>&1 > /dev/null
 fi
 
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
+
 %changelog
+* Fri Oct 23 2009 Stephen Gallagher <sgallagh@redhat.com> - 0.7.0-1
+- New upstream release 0.7.0
+
 * Thu Oct 15 2009 Stephen Gallagher <sgallagh@redhat.com> - 0.6.1-2
 - Fix missing file permissions for sssd-clients