diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/nephele-jobmanager.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/nephele-jobmanager.sh
index f157fc7ca2fe1..59b5a8d0a2078 100755
--- a/stratosphere-dist/src/main/stratosphere-bin/bin/nephele-jobmanager.sh
+++ b/stratosphere-dist/src/main/stratosphere-bin/bin/nephele-jobmanager.sh
@@ -61,6 +61,8 @@ constructJobManagerClassPath() {
 			add=1
 		elif [[ "$jarfile" =~ 'nephele-clustermanager' ]]; then
 			add=1
+		elif [[ "$jarfile" =~ 'nephele-ec2cloudmanager' ]]; then
+			add=1
 		elif [[ "$jarfile" =~ 'commons-codec' ]]; then
 			add=1
 		elif [[ "$jarfile" =~ 'commons-httpclient' ]]; then
diff --git a/stratosphere-dist/src/main/stratosphere-bin/conf/nephele-user.xml b/stratosphere-dist/src/main/stratosphere-bin/conf/nephele-user.xml
index 41af943a78a90..ae6e119b6ec68 100644
--- a/stratosphere-dist/src/main/stratosphere-bin/conf/nephele-user.xml
+++ b/stratosphere-dist/src/main/stratosphere-bin/conf/nephele-user.xml
@@ -102,7 +102,7 @@
 	<!-- the default instance manager for cloud execution mode -->
 	<property>
 		<key>jobmanager.instancemanager.cloud.classname</key>
-		<value>eu.stratosphere.nephele.instance.cloud.EC2CloudManager</value>
+		<value>eu.stratosphere.nephele.instance.cloud.CloudManager</value>
 	</property>
 	
 	<property>