diff --git a/shared-mime-info-0.19.tar.bz2 b/shared-mime-info-0.19.tar.bz2
deleted file mode 100644
index 7f6ab44..0000000
--- a/shared-mime-info-0.19.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f64b5570ec934ddc854cda6535661a9f220577b6096300bbddf7c5cc3a370d5
-size 403316
diff --git a/shared-mime-info-0.20.tar.bz2 b/shared-mime-info-0.20.tar.bz2
new file mode 100644
index 0000000..7255033
--- /dev/null
+++ b/shared-mime-info-0.20.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c
+size 429405
diff --git a/shared-mime-info-po.patch b/shared-mime-info-po.patch
deleted file mode 100644
index 1d7304a..0000000
--- a/shared-mime-info-po.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=2178
-================================================================================
---- po/cs.po
-+++ po/cs.po
-@@ -617,6 +617,10 @@
- msgid "MP3 playlist"
- msgstr "Seznam skladeb MP3"
- 
-+#: freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "Zvuk WMA"
-+
- #: freedesktop.org.xml.in.h:151
- msgid "MPEG video"
- msgstr "Video MPEG"
---- po/de.po
-+++ po/de.po
-@@ -588,6 +588,10 @@
- msgid "MP3 playlist"
- msgstr "MP3-Wiedergabeliste"
- 
-+#: ../freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "WMA Audio"
-+
- #: ../freedesktop.org.xml.in.h:144
- msgid "MPEG video"
- msgstr "MPEG-Video"
---- po/es.po
-+++ po/es.po
-@@ -625,6 +625,10 @@
- msgid "MP3 playlist"
- msgstr "Lista de reproducción MP3"
- 
-+#: freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "Audio WMA"
-+
- #: freedesktop.org.xml.in.h:151
- msgid "MPEG video"
- msgstr "Vídeo MPEG"
---- po/fi.po
-+++ po/fi.po
-@@ -551,6 +551,10 @@
- msgid "MP3 playlist"
- msgstr "MP3-soittolista"
- 
-+#: ../freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "Audio WMA"
-+
- #: ../freedesktop.org.xml.in.h:135
- msgid "MP4 audio"
- msgstr "MP4-ääni"
---- po/hu.po
-+++ po/hu.po
-@@ -615,6 +615,10 @@
- msgid "MP3 playlist"
- msgstr "MP3-lejátszólista"
- 
-+#: ../freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "WMA-hang"
-+
- #: freedesktop.org.xml.in.h:151
- msgid "MPEG video"
- msgstr "MPEG-videó"
-@@ -1658,9 +1662,6 @@
- #~ msgid "Musepack audio data"
- #~ msgstr "Musepack hangadatok"
- 
--#~ msgid "WMA audio"
--#~ msgstr "WMA hang"
--
- #~ msgid "Andrew Toolkit inset"
- #~ msgstr "Andrew Toolkit-inset"
- 
---- po/it.po
-+++ po/it.po
-@@ -620,6 +620,10 @@
- msgid "MP3 playlist"
- msgstr "Scaletta MP3"
- 
-+#: freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "Audio WMA"
-+
- #: freedesktop.org.xml.in.h:151
- msgid "MPEG video"
- msgstr "Video MPEG"
---- po/ja.po
-+++ po/ja.po
-@@ -555,6 +555,10 @@
- msgid "MP3 playlist"
- msgstr "MP3 演奏リスト"
- 
-+#: ../freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "WMAオーディオ"
-+
- #: ../freedesktop.org.xml.in.h:135
- #, fuzzy
- msgid "MP4 audio"
---- po/pl.po
-+++ po/pl.po
-@@ -556,6 +556,10 @@
- msgid "MP3 playlist"
- msgstr "Lista odtwarzania MP3"
- 
-+#: ../freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "Dźwięk WMA"
-+
- #: ../freedesktop.org.xml.in.h:135
- #, fuzzy
- msgid "MP4 audio"
---- po/pt_BR.po
-+++ po/pt_BR.po
-@@ -553,6 +553,10 @@
- msgid "MP3 playlist"
- msgstr "Lista de Reprodução MP3"
- 
-+#: ../freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "Áudio WMA"
-+
- #: ../freedesktop.org.xml.in.h:135
- #, fuzzy
- msgid "MP4 audio"
---- po/zh_CN.po
-+++ po/zh_CN.po
-@@ -553,6 +553,10 @@
- msgid "MP3 playlist"
- msgstr "MP3 播放列表"
- 
-+#: ../freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "WMA 音频"
-+
- #: ../freedesktop.org.xml.in.h:135
- #, fuzzy
- msgid "MP4 audio"
---- po/zh_TW.po
-+++ po/zh_TW.po
-@@ -555,6 +555,10 @@
- msgid "MP3 playlist"
- msgstr "MP3 播放清單"
- 
-+#: ../freedesktop.org.xml.in.h:317
-+msgid "WMA audio"
-+msgstr "WMA 音訊"
-+
- #: ../freedesktop.org.xml.in.h:135
- msgid "MP4 audio"
- msgstr "MP4 音效"
diff --git a/shared-mime-info-raw.patch b/shared-mime-info-ufraw.patch
similarity index 67%
rename from shared-mime-info-raw.patch
rename to shared-mime-info-ufraw.patch
index 140baa9..49f7fb6 100644
--- a/shared-mime-info-raw.patch
+++ b/shared-mime-info-ufraw.patch
@@ -1,60 +1,56 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=4117
+https://bugs.freedesktop.org/show_bug.cgi?id=8170
 ================================================================================
 --- freedesktop.org.xml.in
 +++ freedesktop.org.xml.in
-@@ -2179,34 +2179,165 @@
+@@ -2316,38 +2316,168 @@
      <glob pattern="*.pict1"/>
      <glob pattern="*.pict2"/>
    </mime-type>
--  <mime-type type="image/x-minolta-mrw">
--    <comment>Minolta raw image</comment>
--    <glob pattern="*.mrw" />
--  </mime-type> 
+-  <mime-type type="image/x-macpaint">
+-    <_comment>MacPaint Bitmap image</_comment>
+-    <glob pattern="*.pntg"/>
 +  <mime-type type="application/x-ufraw">
 +    <sub-class-of type="text/xml"/>
-+    <comment>UFRaw ID file</comment>
++    <_comment>UFRaw ID file</_comment>
 +    <acronym>UFRaw</acronym>
 +    <expanded-acronym>Unidentified Flying Raw</expanded-acronym>
 +    <glob pattern="*.ufraw"/>
 +  </mime-type>
 +  <mime-type type="image/x-dcraw">
-+    <comment>Digital raw image</comment>
++    <_comment>Digital raw image</_comment>
 +    <acronym>DCRaw</acronym>
 +    <expanded-acronym>Digital camera Raw</expanded-acronym>
-+    <glob pattern="*.bay" />
-+    <glob pattern="*.bmq" />
-+    <glob pattern="*.cs1" />
-+    <glob pattern="*.dc2" />
-+    <glob pattern="*.fff" />
-+    <glob pattern="*.k25" />
-+    <glob pattern="*.mos" />
-+    <glob pattern="*.rdc" />
 +  </mime-type>
-+ <mime-type type="image/x-adobe-dng">
++  <mime-type type="image/x-adobe-dng">
 +    <sub-class-of type="image/x-dcraw"/>
 +    <sub-class-of type="image/tiff"/>
-+    <comment>Adobe Digital Negative</comment>
++    <_comment>Adobe Digital Negative</_comment>
 +    <acronym>DNG</acronym>
 +    <expanded-acronym>Digital Negative</expanded-acronym>
 +    <glob pattern="*.dng"/>
-+  </mime-type>
-+  <!-- Canon has 2 format: CRW and CR2 -->
+   </mime-type>
+-  <mime-type type="image/x-minolta-mrw">
+-    <comment>Minolta raw image</comment>
+-    <glob pattern="*.mrw" />
+-  </mime-type> 
++  <!-- Canon has 2 format: CRW and CR2  !-->
++  <!-- CRW is easy !-->
    <mime-type type="image/x-canon-crw">
+-    <comment>Canon raw image</comment>
 +    <sub-class-of type="image/x-dcraw"/>
-     <comment>Canon raw image</comment>
++    <_comment>Canon raw image</_comment>
 +    <acronym>CRW</acronym>
 +    <expanded-acronym>Canon RaW</expanded-acronym>
-+    <!-- CRW is easy -->
-+    <magic priority="60">
++    <magic priority="50">
 +      <match value="II\x1a\x00\x00\x00HEAPCCDR" type="string" offset="0"/>
 +    </magic>
      <glob pattern="*.crw"/>
 +  </mime-type>
++  <!-- CR2 is a TIFF !-->
 +  <mime-type type="image/x-canon-cr2">
 +    <sub-class-of type="image/x-dcraw"/>
-+    <!-- CR2 is a TIFF -->
 +    <sub-class-of type="image/tiff"/>
-+    <comment>Canon raw image</comment>
++    <_comment>Canon raw image</_comment>
 +    <acronym>CR2</acronym>
 +    <expanded-acronym>Canon Raw 2</expanded-acronym>
      <glob pattern="*.cr2"/>
@@ -64,57 +60,70 @@ https://bugs.freedesktop.org/show_bug.cgi?id=4117
 -    <glob pattern="*.nef"/>
 +  <mime-type type="image/x-fuji-raf">
 +    <sub-class-of type="image/x-dcraw"/>
-+    <comment>Fuji raw image</comment>
++    <_comment>Fuji raw image</_comment>
 +    <acronym>RAF</acronym>
 +    <expanded-acronym>RAw Format</expanded-acronym>
++    <magic priority="50">
++      <match value="FUJIFILMCCD-RAW " type="string" offset="0"/>
++    </magic>
 +    <glob pattern="*.raf"/>
    </mime-type>
    <mime-type type="image/x-kodak-dcr">
+-    <comment>Kodak raw image</comment>
 +    <sub-class-of type="image/x-dcraw"/>
 +    <sub-class-of type="image/tiff"/>
-     <comment>Kodak raw image</comment>
++    <_comment>Kodak raw image</_comment>
 +    <acronym>DCR</acronym>
 +    <expanded-acronym>Digital Camera Raw</expanded-acronym>
      <glob pattern="*.dcr"/>
    </mime-type>
--  <mime-type type="image/x-kodak-kdc">
-+ <mime-type type="image/x-kodak-kdc">
++  <mime-type type="image/x-kodak-k25">
 +    <sub-class-of type="image/x-dcraw"/>
 +    <sub-class-of type="image/tiff"/>
-     <comment>Kodak raw image</comment>
++    <_comment>Kodak raw image</_comment>
++    <acronym>K25</acronym>
++    <expanded-acronym>Kodak DC25</expanded-acronym>
++    <glob pattern="*.k25"/>
++  </mime-type>
+   <mime-type type="image/x-kodak-kdc">
+-    <comment>Kodak raw image</comment>
++    <sub-class-of type="image/x-dcraw"/>
++    <sub-class-of type="image/tiff"/>
++    <_comment>Kodak raw image</_comment>
 +    <acronym>KDC</acronym>
 +    <expanded-acronym>Kodak Digital Camera</expanded-acronym>
      <glob pattern="*.kdc"/>
    </mime-type>
 +  <mime-type type="image/x-minolta-mrw">
 +    <sub-class-of type="image/x-dcraw"/>
-+    <comment>Minolta raw image</comment>
++    <_comment>Minolta raw image</_comment>
 +    <acronym>MRW</acronym>
 +    <expanded-acronym>Minolta RaW</expanded-acronym>
 +    <magic priority="50">
 +      <match value="\x00MRM" type="string" offset="0"/>
 +    </magic>
-+    <glob pattern="*.mrw"/>
++    <glob pattern="*.mrw" />
 +  </mime-type>
 +  <mime-type type="image/x-nikon-nef">
 +    <sub-class-of type="image/x-dcraw"/>
 +    <sub-class-of type="image/tiff"/>
-+    <comment>Nikon raw image</comment>
++    <_comment>Nikon raw image</_comment>
 +    <acronym>NEF</acronym>
 +    <expanded-acronym>Nikon Electronic Format</expanded-acronym>
 +    <glob pattern="*.nef"/>
 +  </mime-type>
    <mime-type type="image/x-olympus-orf">
+-    <comment>Olympus raw image</comment>
 +    <sub-class-of type="image/x-dcraw"/>
-     <comment>Olympus raw image</comment>
++    <_comment>Olympus raw image</_comment>
 +    <acronym>ORF</acronym>
 +    <expanded-acronym>Olympus Raw Format</expanded-acronym>
 +    <magic priority="50">
-+      <!-- an ORF file is basically a TIFF file with a non standard
-+	   header IIRO which is not nice since it is only composed
-+	   of ASCII codes. Fortunately, the TIFF header is followed
-+	   by the offset of the first TIFF ifd which is always
-+	   0x00000008 (Little endian) for an ORF -->
++      <!-- an ORF file is basically a TIFF file with a non standard !-->
++      <!-- header IIRO which is not nice since it is only composed  !-->
++      <!-- of ASCII codes. Fortunately, the TIFF header is followed !-->
++      <!-- by the offset of the first TIFF ifd which is always      !-->
++      <!-- 0x00000008 (Little endian) for an ORF                    !-->
 +      <match value="IIRO\x08\x00\x00\x00" type="string" offset="0"/>
 +    </magic>
      <glob pattern="*.orf"/>
@@ -124,9 +133,9 @@ https://bugs.freedesktop.org/show_bug.cgi?id=4117
 -    <glob pattern="*.raf"/>
 +  <mime-type type="image/x-panasonic-raw">
 +    <sub-class-of type="image/x-dcraw"/>
-+    <comment>Panasonic raw image</comment>
++    <_comment>Panasonic raw image</_comment>
 +    <magic priority="50">
-+      <!-- Some kind of TIFF file with a non-standard version in prefix -->
++      <!-- Some kind of TIFF file with a non-standard version in prefix !-->
 +      <match value="IIU\x00\x08\x00\x00\x00" type="string" offset="0"/>
 +    </magic>
 +    <glob pattern="*.raw"/>
@@ -134,21 +143,21 @@ https://bugs.freedesktop.org/show_bug.cgi?id=4117
 +  <mime-type type="image/x-pentax-pef">
 +    <sub-class-of type="image/x-dcraw"/>
 +    <sub-class-of type="image/tiff"/>
-+    <comment>Pentax raw image</comment>
++    <_comment>Pentax raw image</_comment>
 +    <acronym>PEF</acronym>
 +    <expanded-acronym>Pentax Electronic Format</expanded-acronym>
 +    <glob pattern="*.pef"/>
 +  </mime-type>
 +  <mime-type type="image/x-sigma-x3f">
 +    <sub-class-of type="image/x-dcraw"/>
-+    <comment>Sigma raw image</comment>
++    <_comment>Sigma raw image</_comment>
 +    <acronym>X3F</acronym>
 +    <expanded-acronym>X3 Foveon</expanded-acronym>
 +      <magic priority="50">
-+        <!-- The header is "FOVb" (Foveon) -->
++        <!-- The header is "FOVb" (Foveon) !-->
 +        <match value="FOVb" type="string" offset="0">
-+          <!-- Followed by a 32bit LSB specifying the version number (major.minor) -->
-+          <match value="0x00FF00FF" type="little32" offset="4" mask="0xFF00FF00"/>
++          <!-- Followed by a 32bit LSB specifying the version number (major.minor) !-->
++          <match value="0x00FF00FF" type="little32" offset="4" mask="0xFF00FF00" />
 +        </match>
 +      </magic>
 +    <glob pattern="*.x3f"/>
@@ -158,7 +167,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=4117
 +    <sub-class-of type="image/tiff"/>
 +    <acronym>SRF</acronym>
 +    <expanded-acronym>Sony Raw Format</expanded-acronym>
-+    <comment>Sony raw image</comment>
++    <_comment>Sony raw image</_comment>
 +    <glob pattern="*.srf"/>
 +  </mime-type>
 +  <mime-type type="image/x-sony-sr2">
@@ -166,7 +175,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=4117
 +    <sub-class-of type="image/tiff"/>
 +    <acronym>SR2</acronym>
 +    <expanded-acronym>Sony Raw format 2</expanded-acronym>
-+    <comment>Sony raw image</comment>
++    <_comment>Sony raw image</_comment>
 +    <glob pattern="*.sr2"/>
 +  </mime-type>
 +  <mime-type type="image/x-sony-arw">
@@ -174,8 +183,19 @@ https://bugs.freedesktop.org/show_bug.cgi?id=4117
 +    <sub-class-of type="image/tiff"/>
 +    <acronym>ARW</acronym>
 +    <expanded-acronym>Alpha Raw format</expanded-acronym>
-+    <comment>Sony raw image</comment>
++    <_comment>Sony raw image</_comment>
 +    <glob pattern="*.arw"/>
    </mime-type>
    <mime-type type="image/png">
      <_comment>PNG image</_comment>
+@@ -2557,6 +2687,10 @@
+     <_comment>LightWave scene</_comment>
+     <glob pattern="*.lws"/>
+   </mime-type>
++  <mime-type type="image/x-macpaint">
++    <_comment>MacPaint Bitmap image</_comment>
++    <glob pattern="*.pntg"/>
++  </mime-type>
+   <mime-type type="image/x-msod">
+     <_comment>Office drawing</_comment>
+     <glob pattern="*.msod"/>
diff --git a/shared-mime-info.changes b/shared-mime-info.changes
index fb3713f..cbf3abf 100644
--- a/shared-mime-info.changes
+++ b/shared-mime-info.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Feb 19 15:44:32 CET 2007 - sbrabec@suse.cz
+
+- Updated to version 0.20:
+  * Many new MIME types added (see NEWS for complete list).
+  * Move *.ram files to application/ram
+  * Use the preferred Matroska mime-types, includes Matroska audio
+  * Detect Makefile with a shebang at the start
+  * Make DIA a sub-class of application/xml
+  * Clean up PGP/GnuPG file types
+  * Avoid misdetecting Java files as C files
+  * Merge the application/vnd.palm and application/x-palm-database
+    mime-types
+  * Make mbox as a sub-class of text/plain
+  * Remove bogus magic for Targa files
+  * Clean up XSLT mime-types depending on version
+  * Move compressed SVG files to image/svg+xml-compressed
+  * Move compressed pcf (font) detection to application/x-font-pcf
+  * Fix CPIO description
+  * Don't abort when update-mime-database can't open a file
+  * Move the pkgconfig file to $(datadir)
+  * Skip the translation of update-mime-database.c
+  * Have a quiet output to update-mime-database by default
+- Updated RAW patch from Freedesktop#8170.
+
 -------------------------------------------------------------------
 Mon Jan  8 16:45:30 CET 2007 - sbrabec@suse.cz
 
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 3587946..be70b32 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package shared-mime-info (Version 0.19)
+# spec file for package shared-mime-info (Version 0.20)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,16 +12,15 @@
 
 Name:           shared-mime-info
 BuildRequires:  glib2-devel intltool libxml2-devel perl-XML-Parser
-Version:        0.19
-Release:        27
+Version:        0.20
+Release:        1
 URL:            http://freedesktop.org/wiki/Software/shared-mime-info
 Group:          System/X11/Utilities
 License:        GNU General Public License (GPL)
 Summary:        Shared MIME Database
 Source:         %{name}-%{version}.tar.bz2
 Source1:        mime-info-to-mime
-Patch:          shared-mime-info-po.patch
-Patch1:         shared-mime-info-raw.patch
+Patch:          shared-mime-info-ufraw.patch
 Autoreqprov:    on
 # needed by mime-info-to-mime:
 Requires:       /bin/rm /bin/mkdir /usr/bin/fgrep
@@ -45,9 +44,8 @@ Authors:
     Thomas Leonard <tal00r@ecs.soton.ac.uk>
 
 %prep
-%setup
+%setup -q
 %patch
-%patch1
 
 %build
 autoreconf -f -i
@@ -55,7 +53,7 @@ autoreconf -f -i
 make %{?jobs:-j%jobs}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
 install %{S:1} $RPM_BUILD_ROOT%{_bindir}/
 %find_lang %{name}
 
@@ -70,11 +68,33 @@ usr/bin/update-mime-database usr/share/mime >/dev/null
 %doc COPYING ChangeLog NEWS README
 %{_bindir}/*
 %{_datadir}/mime/packages/*.xml
+%{_datadir}/pkgconfig/*.pc
 %ghost %{_datadir}/mime/[a-ms-vX]*
-%{_libdir}/pkgconfig/*.pc
 %{_mandir}/man?/*.*
 
-%changelog -n shared-mime-info
+%changelog
+* Mon Feb 19 2007 - sbrabec@suse.cz
+- Updated to version 0.20:
+  * Many new MIME types added (see NEWS for complete list).
+  * Move *.ram files to application/ram
+  * Use the preferred Matroska mime-types, includes Matroska audio
+  * Detect Makefile with a shebang at the start
+  * Make DIA a sub-class of application/xml
+  * Clean up PGP/GnuPG file types
+  * Avoid misdetecting Java files as C files
+  * Merge the application/vnd.palm and application/x-palm-database
+  mime-types
+  * Make mbox as a sub-class of text/plain
+  * Remove bogus magic for Targa files
+  * Clean up XSLT mime-types depending on version
+  * Move compressed SVG files to image/svg+xml-compressed
+  * Move compressed pcf (font) detection to application/x-font-pcf
+  * Fix CPIO description
+  * Don't abort when update-mime-database can't open a file
+  * Move the pkgconfig file to $(datadir)
+  * Skip the translation of update-mime-database.c
+  * Have a quiet output to update-mime-database by default
+- Updated RAW patch from Freedesktop#8170.
 * Mon Jan 08 2007 - sbrabec@suse.cz
 - Spec file cleanup.
 * Wed Jan 03 2007 - sbrabec@suse.cz