diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java b/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java
index c025d904..50666fc1 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java
@@ -67,6 +67,8 @@ public class Agent {
 
 		HTTPIE("httpie", "HTTPie"),
 
+		JBOSS_FORGE("jbossforge", "SpringBootForgeCli"),
+
 		SPRING_BOOT_CLI("spring", "SpringBootCli"),
 
 		STS("sts", "STS"),
diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java b/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java
index e95e42bb..cb9e7b95 100644
--- a/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java
@@ -44,6 +44,13 @@ public class AgentTests {
 		assertThat(agent.getVersion(), equalTo("0.8.0"));
 	}
 
+	@Test
+	public void checkJBossForge() {
+		Agent agent = Agent.fromUserAgent("SpringBootForgeCli/1.0.0.Alpha4");
+		assertThat(agent.getId(), equalTo(Agent.AgentId.JBOSS_FORGE));
+		assertThat(agent.getVersion(), equalTo("1.0.0.Alpha4"));
+	}
+
 	@Test
 	public void checkSpringBootCli() {
 		Agent agent = Agent.fromUserAgent("SpringBootCli/1.3.1.RELEASE");