diff --git a/.gitignore b/.gitignore
index 8c4ba8e..b9c63dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@
 
 /Makefile
 /Makefile.in
-/.vagrant/
+/contrib/.vagrant/
 /aclocal/libtool.m4
 /aclocal/ltoptions.m4
 /aclocal/ltsugar.m4
diff --git a/Makefile.am b/Makefile.am
index f7758af..c8d85ae 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,6 @@
 			doap.rdf \
 			sonar-project.properties \
 			tutorial \
-			Vagrantfile \
 			LICENSE \
 			CHANGES \
 			NOTICE
diff --git a/Vagrantfile b/contrib/Vagrantfile
similarity index 63%
rename from Vagrantfile
rename to contrib/Vagrantfile
index b63dae9..dd2e2ee 100644
--- a/Vagrantfile
+++ b/contrib/Vagrantfile
@@ -1,9 +1,25 @@
-# © The Apache Software Foundation
-# http://www.apache.org/licenses/LICENSE-2.0
-
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 $script = <<SCRIPT
 echo I am provisioning for Apache Thrift ...
 sudo apt-get update -qq -y
@@ -19,7 +35,7 @@
 #sudo apt-get install -qq ghc6 cabal-install libghc6-binary-dev libghc6-network-dev libghc6-http-dev
 sudo apt-get install -qq mingw32 mingw32-binutils mingw32-runtime
 echo I am building Apache Thrift ...
-cd /vagrant
+cd /thrift
 sh bootstrap.sh
 sh configure
 make
@@ -36,6 +52,8 @@
   # config.vm.box = "precise32"
   # config.vm.box_url = "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-vagrant-i386-disk1.box"
 
+  config.vm.synced_folder "../", "/thrift"
+
   # call the script
   config.vm.provision :shell, :inline => $script
 end