diff --git a/apache-sshd.spec b/apache-sshd.spec
index 659f79d..a22ab5a 100644
--- a/apache-sshd.spec
+++ b/apache-sshd.spec
@@ -30,8 +30,6 @@ Patch0:         0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
 Patch1:         apache-sshd-javadoc.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
-BuildRequires:  mvn(io.netty:netty-handler)
-BuildRequires:  mvn(io.netty:netty-transport)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.i2p.crypto:eddsa)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
@@ -44,11 +42,8 @@ BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
 BuildRequires:  mvn(org.apache:apache:pom:)
 BuildRequires:  mvn(org.bouncycastle:bcpg-jdk15on)
 BuildRequires:  mvn(org.bouncycastle:bcpkix-jdk15on)
-BuildRequires:  mvn(org.c02e.jpgpj:jpgpj)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
-BuildRequires:  mvn(org.eclipse.jgit:org.eclipse.jgit)
-BuildRequires:  mvn(org.eclipse.jgit:org.eclipse.jgit.pgm)
 BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildArch:      noarch
@@ -71,7 +66,6 @@ This package provides %{name}.
 %patch1 -p1
 
 rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix
-
 %pom_remove_dep -r tomcat:tomcat-apr
 
 # Avoid unnecessary dep on spring framework
@@ -81,8 +75,14 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix
 # Build the core modules only
 %pom_disable_module sshd-mina
 %pom_remove_dep -r org.apache.sshd:sshd-mina
+%pom_disable_module sshd-netty
+%pom_disable_module sshd-ldap
+%pom_disable_module sshd-git
+%pom_disable_module sshd-contrib
 %pom_disable_module sshd-spring-sftp
 %pom_remove_dep -r org.apache.sshd:sshd-spring-sftp
+%pom_disable_module sshd-cli
+%pom_disable_module sshd-openpgp
 %pom_disable_module assembly
 
 # Disable plugins we don't need for RPM builds