diff --git a/bsh.spec b/bsh.spec
index be29400..cf24e61 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -29,10 +29,11 @@
 #
 
 %global reltag b6
+%bcond_without  desktop
 
 Name:           bsh
 Version:        2.0
-Release:        5.%{reltag}%{?dist}
+Release:        6.%{reltag}%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
 URL:            http://www.beanshell.org/
@@ -122,12 +123,14 @@ ant test dist
 
 %mvn_install -J javadoc
 
+%if %{with desktop}
 # menu entry
 desktop-file-install --mode=644 \
   --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 install -d -m 755 %{buildroot}%{_datadir}/pixmaps
 convert src/bsh/util/lib/icon.gif \
   %{buildroot}%{_datadir}/pixmaps/bsh.png
+%endif
 
 install -d -m 755 %{buildroot}%{_datadir}/%{name}
 install -d -m 755 %{buildroot}%{_datadir}/%{name}/webapps
@@ -147,8 +150,10 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 %license LICENSE NOTICE
 %doc README.md src/Changes.html src/CodeMap.html docs/faq/faq.html
 %attr(0755,root,root) %{_bindir}/%{name}*
+%if %{with desktop}
 %{_datadir}/applications/%{name}-desktop.desktop
 %{_datadir}/pixmaps/%{name}.png
+%endif
 %{_datadir}/%{name}
 
 %files manual
@@ -161,6 +166,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 %license LICENSE NOTICE
 
 %changelog
+* Tue Jun 13 2017 Michael Simacek <msimacek@redhat.com> - 0:2.0-6.b6
+- Add conditional for desktop file
+
 * Fri Mar  3 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-5.b6
 - Install desktop icon to pixmaps instead of icons