diff --git a/deja-dup.changes b/deja-dup.changes
index d900c2f..5f034a9 100644
--- a/deja-dup.changes
+++ b/deja-dup.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Dec 14 16:17:23 CET 2010 - vuntz@opensuse.org
+
+- Own directories of localized man pages to fix build. Also move
+  those files to the main package: they should eventually live in
+  the lang subpackage, but at the moment, they would create a file
+  conflict between bundles and the lang subpackage.
+- Own %{_libdir}/deja-dup.
+
 -------------------------------------------------------------------
 Sat Nov 20 20:22:58 CET 2010 - badshah400@gmail.com
 
diff --git a/deja-dup.spec b/deja-dup.spec
index cfb33b3..05c566b 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -100,7 +100,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 # Localized man pages
 for man in %{buildroot}%{_mandir}/*/man1/*; do
     LOCALE=`echo $man | sed "s:.*%{_mandir}/\([^/]*\)/man1/.*:\1:g"`
-    echo "%%lang($LOCALE) %%doc ${man##%{buildroot}}*" >> %{name}.lang
+    echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang
+    echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang
+    echo "%%lang($LOCALE) %%doc ${man##%{buildroot}}*" >> %{name}.man-lang
 done
 # create symlinks for man pages
 %fdupes -s %{buildroot}%{_mandir}
@@ -117,7 +119,7 @@ done
 %clean
 rm -rf %{buildroot}
 
-%files -f %{name}.schemas_list
+%files -f %{name}.schemas_list -f %{name}.man-lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS
 %{_bindir}/deja-dup
@@ -125,6 +127,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/deja-dup.*
 %{_mandir}/man1/deja-dup-preferences.*
 %{_sysconfdir}/xdg/autostart/deja-dup-monitor.desktop
+# We explicitly list the content of %%{_libdir}/deja-dup to make sure we put
+# the files in the right subpackage
+%dir %{_libdir}/deja-dup
 %{_libdir}/deja-dup/deja-dup-monitor
 %{_datadir}/applications/deja-dup.desktop
 %{_datadir}/applications/deja-dup-preferences.desktop