diff --git a/.travis.yml b/.travis.yml
index f3ad373..f6cffa4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,10 +14,16 @@ install:
   - sudo /snap/bin/lxd waitready
   - sudo /snap/bin/lxd init --auto
   - mkdir -p "$TRAVIS_BUILD_DIR/snaps-cache"
+matrix:
+  include:
+    - name: "Eclipse Java"
+      env: VARIANT=java
+    - name: "Eclipse CDT"
+      env: VARIANT=cdt
 script:
   - export PATH=/snap/bin:$PATH
-  - sudo snapcraft cleanbuild
-  - sudo cp *.snap "$(echo "$TRAVIS_REPO_SLUG" | sed -e 's|.*/\(.*\)|\1|')-pr$TRAVIS_PULL_REQUEST.snap"
+  - cd eclipse-$VARIANT && sudo snapcraft cleanbuild
+  - sudo cp eclipse-$VARIANT/*.snap "$(echo "$TRAVIS_REPO_SLUG" | sed -e 's|.*/\(.*\)|\1|')-pr$TRAVIS_PULL_REQUEST.snap"
 after_success:
   - sudo snap install transfer
   - timeout 180 sudo /snap/bin/transfer "$(echo "$TRAVIS_REPO_SLUG" | sed -e 's|.*/\(.*\)|\1|')-pr$TRAVIS_PULL_REQUEST.snap"
diff --git a/README.md b/README.md
index a2a9447..3ecb746 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ distributions.</p>
 
 ([Don't have snapd installed?](https://snapcraft.io/docs/core/install))
 
-![eclipse](http://www.eclipse.org/screenshots/images/SDK-RedFlag_Linux.png "eclipse")
+![eclipse](https://upload.wikimedia.org/wikipedia/commons/thumb/f/fd/Eclipse_4.6.3.png/1200px-Eclipse_4.6.3.png "eclipse")
 
 <p align="center">Published for <img src="http://anything.codes/slack-emoji-for-techies/emoji/tux.png" align="top" width="24" /> with :gift_heart: by Snapcrafters</p>
 
@@ -43,7 +43,7 @@ upstream so Eclipse.org can authoritatively publish future releases.
   - [x] Convert the snap to `strict` confinement, or `classic` confinement if it qualifies
   - [x] Publish the confined snap in the Snap store beta channel
   - [x] Update the install instructions in this `README.md`
-  - [ ] Post a call for testing on the [Snapcraft Forum](https://forum.snapcraft.io)
+  - [x] Post a call for testing on the [Snapcraft Forum](https://forum.snapcraft.io)
   - [x] Ask a [Snapcrafters admin](https://github.com/orgs/snapcrafters/people?query=%20role%3Aowner) to fork your repo into github.com/snapcrafters, transfer the snap name from you to snapcrafters, and configure the repo for automatic publishing into edge on commit
   - [x] Add the provided Snapcraft build badge to this `README.md`
   - [x] Publish the snap in the Snap store stable channel
diff --git a/eclipse.desktop b/eclipse-cdt/eclipse-cdt.desktop
similarity index 61%
rename from eclipse.desktop
rename to eclipse-cdt/eclipse-cdt.desktop
index 4f974fe..47de120 100644
--- a/eclipse.desktop
+++ b/eclipse-cdt/eclipse-cdt.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Eclipse
+Name=Eclipse CDT
 Icon=/icon.xpm
 Exec="/eclipse" %f
-Comment=Eclipse IDE
-Categories=Development;IDE;
+Comment=Eclipse CDT IDE
+Categories=Development;IDE;C++
 Terminal=false
 StartupWMClass=eclipse
diff --git a/eclipse-cdt/snap/snapcraft.yaml b/eclipse-cdt/snap/snapcraft.yaml
new file mode 100644
index 0000000..1a30c94
--- /dev/null
+++ b/eclipse-cdt/snap/snapcraft.yaml
@@ -0,0 +1,34 @@
+name: eclipse-cdt
+version: '2018-09'
+summary: Extensible Tool Platform and Java IDE
+description:
+  Eclipse provides IDEs and platforms for nearly every language and architecture.
+  We are famous for our Java IDE, C/C++, JavaScript and PHP IDEs built on extensible
+  platforms for creating desktop, Web and cloud IDEs. These platforms deliver the most
+  extensive collection of add-on tools available for software developers.
+
+grade: stable
+confinement: classic
+
+apps:
+  eclipse:
+    command: eclipse-cdt
+    desktop: eclipse-cdt.desktop
+
+parts:
+  desktop:
+    after: [eclipse]
+    plugin: dump
+    source: .
+    prime:
+      - eclipse-cdt.desktop
+
+  eclipse:
+    plugin: dump
+    source:
+      - on amd64: http://ftp.halifax.rwth-aachen.de/eclipse/technology/epp/downloads/release/$SNAPCRAFT_PROJECT_VERSION/R/eclipse-cdt-$SNAPCRAFT_PROJECT_VERSION-linux-gtk-x86_64.tar.gz
+      - on i386: http://ftp.halifax.rwth-aachen.de/eclipse/technology/epp/downloads/release/$SNAPCRAFT_PROJECT_VERSION/R/eclipse-cdt-$SNAPCRAFT_PROJECT_VERSION-linux-gtk.tar.gz
+      - on armhf: fail
+      - on arm64: fail
+    build-attributes:
+      - no-patchelf
diff --git a/eclipse-java/eclipse-java.desktop b/eclipse-java/eclipse-java.desktop
new file mode 100644
index 0000000..b1b3278
--- /dev/null
+++ b/eclipse-java/eclipse-java.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Eclipse Java
+Icon=/icon.xpm
+Exec="/eclipse" %f
+Comment=Eclipse Java IDE
+Categories=Development;IDE;Java
+Terminal=false
+StartupWMClass=eclipse
diff --git a/snap/snapcraft.yaml b/eclipse-java/snap/snapcraft.yaml
similarity index 90%
rename from snap/snapcraft.yaml
rename to eclipse-java/snap/snapcraft.yaml
index fe66129..4626ea5 100644
--- a/snap/snapcraft.yaml
+++ b/eclipse-java/snap/snapcraft.yaml
@@ -1,4 +1,4 @@
-name: eclipse
+name: eclipse-java
 version: '2018-09'
 summary: Extensible Tool Platform and Java IDE
 description:
@@ -12,8 +12,8 @@ confinement: classic
 
 apps:
   eclipse:
-    command: eclipse
-    desktop: eclipse.desktop
+    command: eclipse-java
+    desktop: eclipse-java.desktop
 
 parts:
   desktop:
@@ -21,7 +21,7 @@ parts:
     plugin: dump
     source: .
     prime:
-      - eclipse.desktop
+      - eclipse-java.desktop
 
   eclipse:
     plugin: dump