diff --git a/velocity.spec b/velocity.spec
index 7c53d21..ea1a30c 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -1,6 +1,8 @@
+%bcond_without  hsqldb
+
 Name:           velocity
 Version:        1.7
-Release:        19%{?dist}
+Release:        20%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
@@ -24,11 +26,13 @@ BuildRequires:  ant
 BuildRequires:  antlr
 BuildRequires:  junit
 BuildRequires:  ant-junit
+%if %{with hsqldb}
 BuildRequires:  hsqldb-lib
+%endif
 BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-lang
-BuildRequires:  servlet3
+BuildRequires:  glassfish-servlet-api
 BuildRequires:  jakarta-oro
 BuildRequires:  jaxen
 BuildRequires:  jdom
@@ -125,6 +129,10 @@ cp %{SOURCE1} ./pom.xml
 # Remove werken-xpath Import/Export refences in OSGi manifest file
 %patch7 -p1
 
+%if %{without hsqldb}
+rm -r src/test/org/apache/velocity/test/sql
+%endif
+
 # -----------------------------------------------------------------------------
 
 %build
@@ -134,7 +142,7 @@ antlr \
 apache-commons-collections \
 commons-lang \
 commons-logging \
-tomcat-servlet-api \
+glassfish-servlet-api \
 junit \
 jakarta-oro \
 log4j:log4j:1.2.17 \
@@ -184,6 +192,10 @@ cp -pr examples test %{buildroot}%{_datadir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Feb 07 2017 Michael Simacek <msimacek@redhat.com> - 0:1.7-20
+- Add hsqldb conditional
+- Switch to glassfish-servlet-api
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild