diff --git a/zynjacku-zero-plugins.patch b/zynjacku-zero-plugins.patch
new file mode 100644
index 0000000..b139ff2
--- /dev/null
+++ b/zynjacku-zero-plugins.patch
@@ -0,0 +1,15 @@
+diff -rupN zynjacku-5.old/zynjacku.py zynjacku-5/zynjacku.py
+--- zynjacku-5.old/zynjacku.py	2009-06-05 12:40:05.000000000 -0400
++++ zynjacku-5/zynjacku.py	2010-01-22 17:59:56.000000000 -0500
+@@ -2432,7 +2432,10 @@ class host:
+ 
+             plugins = self.lv2db.getPluginList()
+ 
+-            step = 1.0 / len(plugins)
++            if len(plugins) > 0:
++                step = 1.0 / len(plugins)
++            else:
++                step = 1.0
+             progress = 0.0
+ 
+             for uri in plugins:
diff --git a/zynjacku.desktop b/zynjacku.desktop
index f54fd22..cf8515a 100644
--- a/zynjacku.desktop
+++ b/zynjacku.desktop
@@ -6,4 +6,4 @@ Exec=zynjacku
 Icon=zynjacku
 Terminal=false
 Type=Application
-Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;
+Categories=GTK;AudioVideo;Audio;Midi;X-Jack;X-Synthesis;
diff --git a/zynjacku.spec b/zynjacku.spec
index 79eccec..0eafb3f 100644
--- a/zynjacku.spec
+++ b/zynjacku.spec
@@ -2,7 +2,7 @@
 
 Name:		zynjacku
 Version:	5
-Release:	1%{?dist}
+Release:	4%{?dist}
 Summary:	LV2 synths and plugins host
 Group:		Applications/Multimedia
 License:	GPLv2
@@ -15,6 +15,9 @@ Source3:	lv2rack.desktop
 # Correct lv2 path on 64bit systems:
 # https://gna.org/bugs/?13687
 Patch0:		%{name}-lv2path.patch
+# Don't crash when there are no plugins installed RHBZ#551480
+# Patch sent upstream via email
+Patch1:         %{name}-zero-plugins.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
@@ -44,6 +47,7 @@ lv2rack is a host for LV2 effect plugins.
 %prep
 %setup -q
 %patch0 -p1 -b .lv2path
+%patch1 -p1 -b .noplugin
 
 %build
 export am_cv_python_pythondir=%{python_sitearch}
@@ -105,6 +109,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/72x72/apps/%{name}.png
 
 %changelog
+* Fri Jan 22 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 5-4
+- Don't crash when there are no plugins installed RHBZ#551480
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 5-3
+- Update the .desktop file
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jun 13 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 5-1
 - Update to 5