diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 0de7b5f88c4ff155ee69dc5baa38401a1b9115f6..396d95c233d6ee8c6c2aec4700512a8cfecf9539 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -84,7 +84,7 @@ TABLE_PREFIX_BZ=bz_
 TABLE_PREFIX_IBK=ibk_
 TEMPLATE_PROJECT_FILE=$NEXUS_PATH/de/krismer/CanIGet2/0.1/CanIGet2-0.1.war
 TOMCAT_VERSION=7.0.47
-TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.zip
+TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.tar.gz
 TOMCAT_NAME=tomcat
 TOMCAT_USER=tomcat
 TOPOLOGY_TOLERANCE=0.0005
@@ -311,7 +311,7 @@ if $INSTALL_PGROUTING; then
 #	echo "Installing cmake $CMAKE_VERSION from source"
 #	fn_download_newer $DOWNLOAD_DIR/$CMAKE_FILE http://www.cmake.org/files/$CMAKE_VERSION_MAIN/$CMAKE_FILE
 #	cp $DOWNLOAD_DIR/$CMAKE_FILE $DEPLOY_DIR/$CMAKE_FILE
-#	tar xvzf $DEPLOY_DIR/$CMAKE_FILE -C $DEPLOY_DIR > install_cmake.log 2>&1
+#	tar -xvzf $DEPLOY_DIR/$CMAKE_FILE -C $DEPLOY_DIR > install_cmake.log 2>&1
 #	cd $DEPLOY_DIR/cmake*
 #	./bootstrap >> install_cmake.log 2>&1
 #	make >> install_cmake.log 2>&1
@@ -366,6 +366,10 @@ if $INSTALL_JAVA; then
 	alternatives --set java $DEPLOY_DIR/jre/bin/java >> setup_java.log 2>&1
 	alternatives --install /usr/bin/javac javac $DEPLOY_DIR/jdk/bin/javac 200000 >> setup_java.log 2>&1
 	alternatives --install /usr/bin/jar jar $DEPLOY_DIR/jdk/bin/jar 200000 >> setup_java.log 2>&1
+
+	echo "export JAVA_HOME=$DEPLOY_DIR/jre" > /etc/profile.d/java.sh
+	echo "export PATH=\${JAVA_HOME}/bin:\${PATH}" >> /etc/profile.d/java.sh
+	source /etc/profile.d/java.sh
 fi
 
 if $INSTALL_TOMCAT; then
@@ -375,7 +379,7 @@ if $INSTALL_TOMCAT; then
 
 	fn_download_newer $DOWNLOAD_DIR/$TOMCAT_FILE http://tweedo.com/mirror/apache/tomcat/tomcat-7/v$TOMCAT_VERSION/bin/$TOMCAT_FILE
 	cp $DOWNLOAD_DIR/$TOMCAT_FILE $DEPLOY_DIR/$TOMCAT_FILE
-	unzip -o -d $DEPLOY_DIR $DEPLOY_DIR/$TOMCAT_FILE > install_tomcat.log 2>&1
+	tar -xvzf $DEPLOY_DIR/$TOMCAT_FILE -C $DEPLOY_DIR > install_tomcat.log 2>&1
 	ln -sf $DEPLOY_DIR/apache-tomcat-$TOMCAT_VERSION $DEPLOY_DIR/$TOMCAT_NAME >> install_tomcat.log 2>&1
 
 	groupadd -g 521 $TOMCAT_USER >> install_tomcat.log 2>&1
diff --git a/etc/vagrant/conf/tomcat_startscript.sh b/etc/vagrant/conf/tomcat_startscript.sh
index 745777d1e6b3b09da2080f2ef1b58d1e2f360e65..ea2f0d7ebf60da76de479af32a9d440a4314e7d3 100644
--- a/etc/vagrant/conf/tomcat_startscript.sh
+++ b/etc/vagrant/conf/tomcat_startscript.sh
@@ -9,8 +9,8 @@
 . /etc/init.d/functions
 #. /etc/sysconfig/network
 
-CATALINA_HOME=/opt/apache-tomcat-7.0.39
-CATALINA_BASE=/opt/apache-tomcat-7.0.39
+CATALINA_HOME=/opt/tomcat
+CATALINA_BASE=/opt/tomcat
 TOMCAT_USER=tomcat
 LOCKFILE=/var/lock/subsys/tomcat