diff --git a/jetty.spec b/jetty.spec
index faf1d95..1ea11ec 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
 
 Name:           jetty
 Version:        8.1.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -77,7 +77,6 @@ BuildRequires:  maven
 BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-enforcer-plugin
 BuildRequires:  maven-war-plugin
-BuildRequires:  mongo-java-driver >= 2.6.5-4
 BuildRequires:  objectweb-asm
 BuildRequires:  slf4j
 BuildRequires:  systemd-units
@@ -89,6 +88,7 @@ BuildRequires:  tomcat-servlet-3.0-api
 %if 0%{?rhel} <= 0
 BuildRequires:  eclipse-platform
 BuildRequires:  eclipse-rcp
+BuildRequires:  mongo-java-driver >= 2.6.5-4
 %endif
 
 # we want javamail not classpathx-javamail
@@ -135,8 +135,8 @@ Requires:       jetty-xml              = %{version}-%{release}
 # Requires:       jetty-http-spi         = %{version}-%{release}
 # Requires:       jetty-jaspi            = %{version}-%{release}
 # Requires:       jetty-nested           = %{version}-%{release}
-# Requires:       jetty-nosql            = %{version}-%{release}
 # %if 0%{?rhel} <= 0
+# Requires:       jetty-nosql            = %{version}-%{release}
 # Requires:       jetty-osgi             = %{version}-%{release}
 # %endif
 
@@ -339,19 +339,6 @@ Requires:       tomcat-servlet-3.0-api
 %description    nested
 %{extdesc} %{summary}.
 
-%package        nosql
-Summary:        nosql module for Jetty
-Requires:       java >= 1:1.7.0
-Requires:       jpackage-utils
-Requires:       jetty-project = %{version}-%{release}
-Requires:       jetty-server  = %{version}-%{release}
-Requires:       jetty-util    = %{version}-%{release}
-Requires:       mongo-java-driver >= 2.6.5-4
-Requires:       tomcat-servlet-3.0-api
-
-%description    nosql
-%{extdesc} %{summary}.
-
 %package        overlay-deployer
 Summary:        overlay-deployer module for Jetty
 Requires:       java >= 1:1.7.0
@@ -534,6 +521,19 @@ Requires:       jetty-util    = %{version}-%{release}
 %{extdesc} %{summary}.
 
 %if 0%{?rhel} <= 0
+%package        nosql
+Summary:        nosql module for Jetty
+Requires:       java >= 1:1.7.0
+Requires:       jpackage-utils
+Requires:       jetty-project = %{version}-%{release}
+Requires:       jetty-server  = %{version}-%{release}
+Requires:       jetty-util    = %{version}-%{release}
+Requires:       mongo-java-driver >= 2.6.5-4
+Requires:       tomcat-servlet-3.0-api
+
+%description    nosql
+%{extdesc} %{summary}.
+
 %package        osgi
 Summary:        OSGi module for Jetty
 Requires:       java >= 1:1.7.0
@@ -925,11 +925,6 @@ groupdel %username &>/dev/null || :
 %{_mavenpomdir}/JPP.%{name}-%{name}-nested.pom
 %{_mavendepmapfragdir}/%{name}-%{name}-nested
 
-%files nosql
-%{_javadir}/%{name}/%{name}-nosql.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-nosql.pom
-%{_mavendepmapfragdir}/%{name}-%{name}-nosql
-
 %files overlay-deployer
 %{_javadir}/%{name}/%{name}-overlay-deployer.jar
 %{_mavenpomdir}/JPP.%{name}-%{name}-overlay-deployer.pom
@@ -991,6 +986,11 @@ groupdel %username &>/dev/null || :
 %{_mavendepmapfragdir}/%{name}-%{name}-xml
 
 %if 0%{?rhel} <= 0
+%files nosql
+%{_javadir}/%{name}/%{name}-nosql.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-nosql.pom
+%{_mavendepmapfragdir}/%{name}-%{name}-nosql
+
 %files osgi
 %{_javadir}/%{name}/%{name}-osgi*.jar
 %{_javadir}/%{name}/%{name}-httpservice.jar
@@ -1004,6 +1004,9 @@ groupdel %username &>/dev/null || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.2-8
+- Build jetty-nosql conditionally
+
 * Tue May 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.2-7
 - Add unconditional BR on glassfish-jsp to make build-jar-repository work