diff --git a/.cvsignore b/.cvsignore
index 20e974d..e261f73 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 gnome-icon-theme-2.22.0.tar.bz2
 gnome-icon-theme-extra-device-icons.tar.bz2
 gnome-icon-theme-extra-device-icons-2.tar.bz2
+gnome-icon-theme-extra-device-icons-3.tar.bz2
diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec
index 6d9112c..9ff695e 100644
--- a/gnome-icon-theme.spec
+++ b/gnome-icon-theme.spec
@@ -1,9 +1,9 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.22.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.22/%{name}-%{version}.tar.bz2
-Source1: gnome-icon-theme-extra-device-icons-2.tar.bz2
+Source1: gnome-icon-theme-extra-device-icons-3.tar.bz2
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -87,6 +87,11 @@ done
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Apr  1 2008 David Zeuthen <davidz@redhat.com> - 2.22.0-5
+- Switch open and close padlock encrypted drives/media
+- Replace the flash media icons with something that is compatible
+  with the GPL that gnome-icon-theme is under (thanks Mike Langlie)
+
 * Mon Mar 24 2008 David Zeuthen <davidz@redhat.com> - 2.22.0-4
 - Rebuild
 
diff --git a/sources b/sources
index 43b624b..0d6b1d3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 a4c03092da28ad53ed3867aef83f29d9  gnome-icon-theme-2.22.0.tar.bz2
-775ff505ab9c922a23a6a698911d0d30  gnome-icon-theme-extra-device-icons-2.tar.bz2
+6747b7f4db5062a4b422c7f8e6a0c13f  gnome-icon-theme-extra-device-icons-3.tar.bz2