diff --git a/defaults.list b/defaults.list
index 0932549..208e098 100644
--- a/defaults.list
+++ b/defaults.list
@@ -3,22 +3,6 @@ application/x-dia-diagram=fedora-dia.desktop
 #text/x-vcard=evolution.desktop
 #text/x-vcalendar=evolution.desktop
 #text/calendar=evolution.desktop
-application/x-arj=gnome-file-roller.desktop
-application/x-bzip-compressed-tar=gnome-file-roller.desktop
-application/x-bzip=gnome-file-roller.desktop
-application/x-compress=gnome-file-roller.desktop
-application/x-compressed-tar=gnome-file-roller.desktop
-application/x-gzip=gnome-file-roller.desktop
-application/x-glade=gnome-glade-2.desktop
-application/x-lha=gnome-file-roller.desktop
-application/x-lhz=gnome-file-roller.desktop
-application/x-lzop=gnome-file-roller.desktop
-application/x-rar=gnome-file-roller.desktop
-application/x-tar=gnome-file-roller.desktop
-application/x-tarz=gnome-file-roller.desktop
-application/x-tzo=gnome-file-roller.desktop
-application/x-zoo=gnome-file-roller.desktop
-application/zip=gnome-file-roller.desktop
 application/x-cd-image=mount-archive.desktop
 image/x-compressed-xcf=gimp.desktop
 image/x-xcf=gimp.desktop
diff --git a/file-roller-defaults.list b/file-roller-defaults.list
new file mode 100644
index 0000000..3e767c5
--- /dev/null
+++ b/file-roller-defaults.list
@@ -0,0 +1,46 @@
+application/x-7z-compressed=gnome-file-roller.desktop;
+application/x-7z-compressed-tar=gnome-file-roller.desktop;
+application/x-ace=gnome-file-roller.desktop;
+application/x-alz=gnome-file-roller.desktop;
+application/x-ar=gnome-file-roller.desktop;
+application/x-arj=gnome-file-roller.desktop;
+application/x-bzip=gnome-file-roller.desktop;
+application/x-bzip-compressed-tar=gnome-file-roller.desktop;
+application/x-bzip1=gnome-file-roller.desktop;
+application/x-bzip1-compressed-tar=gnome-file-roller.desktop;
+application/x-cabinet=gnome-file-roller.desktop;
+application/x-cbr=gnome-file-roller.desktop;
+application/x-cbz=gnome-file-roller.desktop;
+application/x-compress=gnome-file-roller.desktop;
+application/x-compressed-tar=gnome-file-roller.desktop;
+application/x-cpio=gnome-file-roller.desktop;
+application/x-deb=gnome-file-roller.desktop;
+application/x-ear=gnome-file-roller.desktop;
+application/x-ms-dos-executable=gnome-file-roller.desktop;
+application/x-gtar=gnome-file-roller.desktop;
+application/x-gzip=gnome-file-roller.desktop;
+application/x-gzpostscript=gnome-file-roller.desktop;
+application/x-java-archive=gnome-file-roller.desktop;
+application/x-lha=gnome-file-roller.desktop;
+application/x-lhz=gnome-file-roller.desktop;
+application/x-lrzip=gnome-file-roller.desktop;
+application/x-lrzip-compressed-tar=gnome-file-roller.desktop;
+application/x-lzip=gnome-file-roller.desktop;
+application/x-lzip-compressed-tar=gnome-file-roller.desktop;
+application/x-lzma=gnome-file-roller.desktop;
+application/x-lzma-compressed-tar=gnome-file-roller.desktop;
+application/x-lzop=gnome-file-roller.desktop;
+application/x-lzop-compressed-tar=gnome-file-roller.desktop;
+application/x-rar=gnome-file-roller.desktop;
+application/x-rar-compressed=gnome-file-roller.desktop;
+application/x-rzip=gnome-file-roller.desktop;
+application/x-tar=gnome-file-roller.desktop;
+application/x-tarz=gnome-file-roller.desktop;
+application/x-stuffit=gnome-file-roller.desktop;
+application/x-war=gnome-file-roller.desktop;
+application/x-xz=gnome-file-roller.desktop;
+application/x-xz-compressed-tar=gnome-file-roller.desktop;
+application/x-zip=gnome-file-roller.desktop;
+application/x-zip-compressed=gnome-file-roller.desktop;
+application/x-zoo=gnome-file-roller.desktop;
+application/zip=gnome-file-roller.desktop;
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index df136ed..ba6ddd1 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.90
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -10,6 +10,9 @@ Source1: defaults.list
 # Generated with:
 # for i in `totem-video-indexer -m | grep -v real` ; do if grep MimeType /home/hadess/Projects/Cvs/rhythmbox/data/rhythmbox.desktop.in.in | grep -q "$i;" ; then echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi ; done ; for i in `cat /home/hadess/Projects/jhbuild/totem/data/uri-schemes-list.txt | grep -v ^#` ; do echo "x-scheme-handler/$i=totem.desktop;" >> totem-defaults.list ; done
 Source2: totem-defaults.list
+# Generated with:
+# for i in `grep MimeType= /usr/share/applications/gnome-file-roller.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do if ! `grep -q $i defaults.list` ; then echo $i=gnome-file-roller.desktop\; >> file-roller-defaults.list ; fi ; done
+Source3: file-roller-defaults.list
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel
@@ -45,6 +48,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 cat %SOURCE2 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
+cat %SOURCE3 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 
 ## remove bogus translation files
 ## translations are already in the xml file installed
@@ -68,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Thu Dec 16 2010 Bastien Nocera <bnocera@redhat.com> 0.90-5
+- Auto-generate file-roller's bindings as well
+
 * Wed Dec 08 2010 Bastien Nocera <bnocera@redhat.com> 0.90-4
 - Update defaults.list and update for newer desktop names,
   with help from Edward Sheldrake (#659457)