diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..3b1f80c
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,6 @@
+{
+    "require": {
+        "ext-gd": "*",
+        "ext-mysql": "*"
+    }
+}
diff --git a/manifest.yml b/manifest.yml
index 7f83fc0..bf2dea9 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,6 +1,6 @@
 applications:
 - name: drupal
-  buildpack: https://github.com/ActiveState/heroku-buildpack-php.git
+  buildpack: https://github.com/heroku/heroku-buildpack-php.git
   instances: 1
   mem: 256M
   services:
@@ -14,11 +14,14 @@ applications:
       $STACKATO_APP_ROOT/drush/drush cron >>$STACKATO_APP_ROOT/logs/cron.log 2>&1"
     hooks:
       post-staging:
-      - sh www/stackato-setup.sh
-      - sh www/stackato-sso-workaround.sh
+      - sh stackato-setup.sh
+      - sh stackato-sso-workaround.sh
       pre-running:
       # Workaround to pass $VCAP_SERVICES to cron
-      - python www/vcap-workaround.py
+      - python vcap-workaround.py
     min_version:
       client: 1.4.3
+    requirements:
+      ubuntu:
+      - libjpeg62
 
diff --git a/stackato-setup.sh b/stackato-setup.sh
index fb606a0..521ec28 100644
--- a/stackato-setup.sh
+++ b/stackato-setup.sh
@@ -17,16 +17,16 @@ if ! [ -s $HOME/index.php ]
     mv drush $SAR
 
     $SAR/drush/drush dl drupal --drupal-project-rename=drupal --yes
-    mv drupal/* drupal/.??* www/
+    mv drupal/* drupal/.??* .
     rmdir drupal
 fi
 
 echo "Migrating data to shared filesystem..."
-cp -r www/sites/* $FS/sites
+cp -r sites/* $FS/sites
 
 echo "Symlink to folders in shared filesystem..."
-rm -fr www/sites
-ln -s $FS/sites www/sites
+rm -fr sites
+ln -s $FS/sites sites
 
 # allow custom profile installations (if exist)
 if [ -s custom-profile.sh ]
@@ -37,11 +37,11 @@ fi
 if ! [ -e $FS/INSTALLED ]
   then
     echo "Installing Drupal..."
-    $SAR/drush/drush -r $HOME/www site-install -y --db-url=$DATABASE_URL --account-name=admin --account-pass=passwd --site-name=Stackato --locale=en-US
+    $SAR/drush/drush -r $HOME site-install -y --db-url=$DATABASE_URL --account-name=admin --account-pass=passwd --site-name=Stackato --locale=en-US
 
     echo "Installing Drupal modules..."
-    $SAR/drush/drush -r $HOME/www dl pathauto,views --yes
-    $SAR/drush/drush -r $HOME/www en pathauto,views_ui --yes
+    $SAR/drush/drush -r $HOME dl pathauto,views --yes
+    $SAR/drush/drush -r $HOME en pathauto,views_ui --yes
 
     # Drupal successfully installed
     touch $FS/INSTALLED
diff --git a/stackato-sso-workaround.sh b/stackato-sso-workaround.sh
index a50163f..d667bac 100644
--- a/stackato-sso-workaround.sh
+++ b/stackato-sso-workaround.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-file=`dirname $0`"/includes/bootstrap.inc"
+file="includes/bootstrap.inc"
 line="$(sed -n '/is_https =/=' $file)"
 
 # remove line that sets is_https