diff --git a/attributes/default.rb b/attributes/default.rb
index c6f737f2bc1b75f2ecb41c0ba6d6c6b71e90629f..fa381b3a8b6de39cb9df504feb323aac3de9df0a 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -6,6 +6,8 @@ default['typo3_site']['hostname'] = 'site.dev'
 default['typo3_site']['repository'] = ''
 default['typo3_site']['repository_hostname'] = 'git.domain'
 default['typo3_site']['repository_port'] = 22
+default['typo3_site']['download_typo3'] = false
+default['typo3_site']['typo3_version'] = '6.2'
 default['typo3_site']['deploy_dump'] = '~/site/dump.sql'
 
 # Example:
diff --git a/recipes/default.rb b/recipes/default.rb
index d8ba999758761cee09160a7767730ef5e716a1de..c183b8924c4cc4e40cc70393c750cfa56aaac7a5 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -116,6 +116,46 @@ web_app node['typo3_site']['hostname'] do
 	server_aliases node['typo3_site']['server_aliases']
 end
 
+###################
+### Setup TYPO3 ###
+###################
+
+if node['typo3_site']['download_typo3']
+	bash 'Setup TYPO3' do
+		cwd '/home/vagrant/'
+		user 'vagrant'
+		group 'vagrant'
+		timeout 3000000
+
+		code <<-EOF
+			if [ ! -d #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']} ]
+			then
+				wget http://get.typo3.org/#{node['typo3_site']['typo3_version']} \
+					-O typo3_src-#{node['typo3_site']['typo3_version']}.tgz
+
+				mkdir -p #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']}
+				tar -xzf typo3_src-#{node['typo3_site']['typo3_version']}.tgz --strip-components=1 \
+					-C #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']};
+			fi
+
+			cd #{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}
+			rm -f typo3_src
+			ln -s ../typo3_src-#{node['typo3_site']['typo3_version']} typo3_src
+
+			if [ ! -f typo3 ]
+			then
+				ln -s typo3_src/typo3 typo3
+			fi
+
+			if [ ! -f index.php ]
+			then
+				ln -s typo3_src/index.php index.php
+			fi
+		EOF
+		action :run
+	end
+end
+
 #######################
 ### Provide Sources ###
 #######################
@@ -172,7 +212,6 @@ end
 ### Create Links ###
 ####################
 
-
 node['typo3_site']['create_links'].each do |link_data|
 	link link_data['source'] do
 		to link_data['target']