diff --git a/bsh.spec b/bsh.spec
index 577d735..aef9f53 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -33,7 +33,7 @@
 
 Name:           bsh
 Version:        2.0
-Release:        7.%{reltag}%{?dist}
+Release:        8.%{reltag}%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
 URL:            http://www.beanshell.org/
@@ -49,9 +49,12 @@ BuildRequires:  ant
 BuildRequires:  bsf
 BuildRequires:  junit
 BuildRequires:  javacc
+BuildRequires:  glassfish-servlet-api
+%if %{with desktop}
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
-BuildRequires:  glassfish-servlet-api
+%endif
+
 Requires:       java-headless
 Requires:       bsf
 Requires:       jline
@@ -166,6 +169,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 %license LICENSE NOTICE
 
 %changelog
+* Sat Sep 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-8.b6
+- Properly conditionalize build-requires
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-7.b6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild