diff --git a/bsh.spec b/bsh.spec
index e880b33..d77ba5e 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -32,7 +32,7 @@
 
 Name:           bsh
 Version:        1.3.0
-Release:        12jpp.2%{?dist}
+Release:        12jpp.3%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
 License:        LGPL
@@ -107,6 +107,14 @@ Requires:       /usr/bin/env
 %description demo
 Demonstrations and samples for %{name}.
 
+%package desktop
+Summary:        %{name} integration for the desktop
+Group:          Development/Java
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description desktop
+Contains a menu entry for %{name}.
+
 %prep
 %setup -q -n BeanShell
 %patch0 -p1
@@ -274,11 +282,13 @@ cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post desktop
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
+
+%post
 %update_maven_depmap
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -288,11 +298,13 @@ fi
 %endif
 exit 0
 
-%postun
+%postun desktop
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
+
+%postun
 %update_maven_depmap
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -306,12 +318,9 @@ exit 0
 %defattr(-,root,root)
 %doc src/Changes.html src/License.txt src/README.txt
 %attr(0755,root,root) %{_bindir}/%{name}
-%attr(0755,root,root) %{_bindir}/%{name}-desktop
 %attr(0755,root,root) %{_bindir}/%{name}doc
 %{_javadir}/*
 %dir %{_datadir}/%{name}
-%{_datadir}/applications/*%{name}-desktop.desktop
-%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 %{_datadir}/%{name}/webapps
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
@@ -334,7 +343,15 @@ exit 0
 %doc tests/README.txt tests/Interactive/README
 %{_datadir}/%{name}/*
 
+%files desktop
+%attr(0755,root,root) %{_bindir}/%{name}-desktop
+%{_datadir}/applications/*%{name}-desktop.desktop
+%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
+
 %changelog
+* Mon Mar 10 2008 Permaine Cheung <pcheung@redhat.com> 0:1.3.0-12jpp.3
+- Fix bugzilla 436675. Separate menu entry into desktop subpackage.
+
 * Thu Mar 06 2008 Permaine Cheung <pcheung@redhat.com> 0:1.3.0-12jpp.2
 - Fix bugzilla 417491. Thanks Ville Skytta for the patch.
 - Add menu entry and startup script for bsh desktop.