diff --git a/demo/pom.xml b/demo/pom.xml
index 4a92e87dc..fc70152ac 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -29,9 +29,36 @@
     <dependencies>
         <dependency>
             <groupId>org.jline</groupId>
-            <artifactId>jline</artifactId>
+            <artifactId>jline-terminal-jansi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-terminal-jna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-reader</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-builtins</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-console</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-remote-ssh</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-remote-telnet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-style</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.jline</groupId>
             <artifactId>jline-groovy</artifactId>
diff --git a/graal/pom.xml b/graal/pom.xml
index 83e0a124a..4b7565d38 100644
--- a/graal/pom.xml
+++ b/graal/pom.xml
@@ -29,7 +29,11 @@
     <dependencies>
         <dependency>
             <groupId>org.jline</groupId>
-            <artifactId>jline</artifactId>
+            <artifactId>jline-reader</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-console</artifactId>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 43b654fc1..f37f8a20a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -548,6 +548,18 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>bundle</id>
+            <activation>
+                <property>
+                    <name>!nobundle</name>
+                </property>
+            </activation>
+            <modules>
+                <module>jline</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>java9</id>
             <properties>
@@ -604,9 +616,8 @@
         <module>remote-ssh</module>
         <module>remote-telnet</module>
         <module>style</module>
-        <module>jline</module>
         <module>demo</module>
         <module>graal</module>
-</modules>
+    </modules>
 
 </project>