diff --git a/SPECS/tomcat.spec b/SPECS/tomcat.spec
index 84449fe..d83b109 100644
--- a/SPECS/tomcat.spec
+++ b/SPECS/tomcat.spec
@@ -32,6 +32,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%bcond_with lib
+
 %global jspspec 2.2
 %global major_version 7
 %global minor_version 0
@@ -47,7 +49,7 @@
 Name:          %{?scl_prefix}%{pkg_name}
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1.20%{?dist}
+Release:       1.21%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -127,6 +129,7 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 %description jsp-%{jspspec}-api
 Apache Tomcat JSP API implementation classes.
 
+%if %{with lib}
 %package lib
 Summary: Libraries needed to run the Tomcat Web container
 Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
@@ -140,15 +143,18 @@ Requires(preun): coreutils
 
 %description lib
 Libraries needed to run the Tomcat Web container.
+%endif
 
 %package servlet-%{servletspec}-api
 Summary: Apache Tomcat Servlet API implementation classes
+Obsoletes: %{name}-lib < 0:7.0.42-1.21
 
 %description servlet-%{servletspec}-api
 Apache Tomcat Servlet API implementation classes.
 
 %package el-%{elspec}-api
 Summary: Expression Language v1.0 API
+Obsoletes: %{name}-lib < 0:7.0.42-1.21
 
 %description el-%{elspec}-api
 Expression Language 1.0.
@@ -267,6 +273,7 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}
    %{__ln_s} %{pkg_name}-el-%{elspec}-api.jar %{pkg_name}-el-api.jar
 popd
 
+%if %{with lib}
 pushd ${RPM_BUILD_ROOT}%{libdir}
     # symlink JSP and servlet API jars
     %{__ln_s} ../%{pkg_name}-jsp-%{jspspec}-api.jar .
@@ -278,6 +285,12 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
     %{__ln_s} $(build-classpath log4j) log4j.jar
     %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
 popd
+%else
+rm -Rf ${RPM_BUILD_ROOT}%{libdir}/*
+pushd ${RPM_BUILD_ROOT}%{libdir}
+    %{__ln_s} ../%{pkg_name}-el-%{elspec}-api.jar .
+popd
+%endif
 
 
 # Install the maven metadata
@@ -288,11 +301,13 @@ for pom in *.pom; do
     sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom
 done
 
+%if %{with lib}
 # we won't install dbcp, juli-adapters and juli-extras pom files
 for libname in annotations-api catalina jasper-el jasper catalina-ha; do
     %{__cp} -a %{pkg_name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{pkg_name}-$libname.pom
     %add_maven_depmap JPP.%{pkg_name}-$libname.pom %{pkg_name}/$libname.jar -f "tomcat-lib"
 done
+%endif
 
 # servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
 %{__cp} -a tomcat-jsp-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
@@ -307,6 +322,7 @@ done
 # also provide jetty depmap (originally in jetty package, but it's cleaner to have it here
 %add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet"
 
+%if %{with lib}
 # two special pom where jar files have different names
 %{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{pkg_name}-catalina-tribes.pom
 %add_maven_depmap JPP.%{pkg_name}-catalina-tribes.pom %{pkg_name}/catalina-tribes.jar -f "tomcat-lib"
@@ -322,6 +338,7 @@ done
 
 %{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{pkg_name}-tomcat-util.pom
 %add_maven_depmap JPP.%{pkg_name}-tomcat-util.pom %{pkg_name}/tomcat-util.jar -f "tomcat-lib"
+%endif
 
 %{?scl:EOF}
 
@@ -334,6 +351,7 @@ done
 %{_javadir}/%{pkg_name}-jsp-%{jspspec}*.jar
 %defattr(-,root,root,-)
 
+%if %{with lib}
 %files lib -f output/dist/src/res/maven/.mfiles-tomcat-lib
 %defattr(-,root,root,-)
 %{libdir}
@@ -349,6 +367,7 @@ done
 %{_mavenpomdir}/JPP.%{pkg_name}-tomcat-util.pom
 
 %exclude %{libdir}/%{pkg_name}-el-%{elspec}-api.jar
+%endif
 
 %files servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api
 %defattr(-,root,root,-)
@@ -364,6 +383,10 @@ done
 
 
 %changelog
+* Tue Jul 21 2015 Michal Srb <msrb@redhat.com> - 0:7.0.42-1.21
+- Drop tomcat-lib subpackage
+- Resolves: rhbz#1201916
+
 * Thu Apr  2 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:7.0.42-1.20
 - Fix duplicate file ownership