diff --git a/ubuntu-dev/ubuntu-dev.dockerfile b/ubuntu-dev/ubuntu-dev.dockerfile
index 9084a80..ef9c6a3 100644
--- a/ubuntu-dev/ubuntu-dev.dockerfile
+++ b/ubuntu-dev/ubuntu-dev.dockerfile
@@ -57,6 +57,7 @@ RUN __LLVM_VERSION__="5.0" \
   valgrind \
   x11vnc \
   xvfb \
+  python-dev \
  && mkdir /var/run/sshd \
  && pip install --upgrade pip \
  && pip install --upgrade virtualenv \
@@ -201,6 +202,18 @@ RUN git clone https://github.com/kanaka/noVNC /home/user/.novnc/ \
  && cd /home/user/.novnc \
  && npm install \
  && node ./utils/use_require.js --as commonjs --with-app
+ 
+# Install dependencies to enable codeintel (https://github.com/c9/c9.ide.language.codeintel)
+RUN virtualenv --python=python2 $HOME/.c9/python2
+ && source $HOME/.c9/python2/bin/activate
+ && mkdir /tmp/codeintel
+ && pip download -d /tmp/codeintel codeintel==0.9.3
+ && cd /tmp/codeintel
+ && tar xf CodeIntel-0.9.3.tar.gz
+ && mv CodeIntel-0.9.3/SilverCity CodeIntel-0.9.3/silvercity
+ && tar czf CodeIntel-0.9.3.tar.gz CodeIntel-0.9.3
+ && pip install -U --no-index --find-links=/tmp/codeintel codeintel
+ && rm -rf /tmp/codeintel
 
 # Install the latest Cloud9 SDK with some useful IDE plugins.
 RUN git clone https://github.com/c9/core.git /home/user/.c9sdk \
diff --git a/ubuntu-dev/workspace-janitor.js b/ubuntu-dev/workspace-janitor.js
index 1b8b074..daf46b5 100644
--- a/ubuntu-dev/workspace-janitor.js
+++ b/ubuntu-dev/workspace-janitor.js
@@ -71,6 +71,21 @@ module.exports = function (options) {
 
           // Use a longer scrollback for the Terminal.
           p.settings.user.terminal['@scrollback'] = 10000;
+
+          if (!p.settings.project) {
+            p.settings.project = {};
+          }
+
+          if (typeof p.settings.project === 'string') {
+            p.settings.project = JSON.parse(p.settings.project);
+          }
+
+          if (!p.settings.project.codeintel) {
+            p.settings.project.codeintel = {};
+          }
+
+          // Dismiss the codeintel popup because it's installed
+          p.settings.project.codeintel['@dismiss_installer'] = true;
         }
         break;
     }