diff --git a/velocity.spec b/velocity.spec
index f4d41f2..a05f301 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -26,22 +26,21 @@ Patch9:         0002-Port-to-OpenJDK-11.patch
 
 BuildRequires:  javapackages-local
 BuildRequires:  ant
-BuildRequires:  antlr
-BuildRequires:  junit
 BuildRequires:  ant-junit
-BuildRequires:  apache-commons-collections
-BuildRequires:  apache-commons-logging
-BuildRequires:  apache-commons-lang3
-BuildRequires:  glassfish-servlet-api
-BuildRequires:  jakarta-oro
-BuildRequires:  jaxen
-BuildRequires:  jdom
-BuildRequires:  bcel
-BuildRequires:  log4j12
-BuildRequires:  apache-parent
 
-# It fails one of the arithmetic test cases with gcj
-BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  mvn(antlr:antlr)
+BuildRequires:  mvn(commons-collections:commons-collections)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
+BuildRequires:  mvn(commons-logging:commons-logging)
+BuildRequires:  mvn(javax.servlet:javax.servlet-api)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(oro:oro)
+BuildRequires:  mvn(log4j:log4j:1.2.17)
+BuildRequires:  mvn(jaxen:jaxen)
+BuildRequires:  mvn(org.jdom:jdom)
+BuildRequires:  mvn(org.apache.bcel:bcel)
+
+BuildRequires:  mvn(org.apache:apache:pom:)
 
 %description
 Velocity is a Java-based template engine. It permits anyone to use the
@@ -142,19 +141,18 @@ rm -r src/test/org/apache/velocity/test/sql
 %build
 
 export CLASSPATH=$(build-classpath \
-antlr \
-apache-commons-collections \
-commons-lang3 \
-commons-logging \
-glassfish-servlet-api \
-junit \
-jakarta-oro \
+antlr:antlr \
+commons-collections:commons-collections \
+org.apache.commons:commons-lang3 \
+commons-logging:commons-logging \
+javax.servlet:javax.servlet-api \
+junit:junit \
+oro:oro \
 log4j:log4j:1.2.17 \
-jaxen \
-jdom \
-bcel \
-hsqldb \
-junit)
+jaxen:jaxen \
+org.jdom:jdom \
+org.apache.bcel:bcel \
+)
 ant \
   -buildfile build/build.xml \
   -Dbuild.sysclasspath=first \