diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp
index 9bf4c8d84..4ca66ecfd 100644
--- a/.vagrant-puppet/manifests/default.pp
+++ b/.vagrant-puppet/manifests/default.pp
@@ -312,3 +312,17 @@ exec { 'install ZendFramework':
   unless  => 'rpm -qa | grep php-ZendFramework',
   require => Class['epel']
 }
+
+package { 'boost-devel':
+  ensure => installed
+}
+
+cmmi { 'icinga2':
+  url     => 'http://sourceforge.net/projects/icinga/files/icinga2/0.0.1/icinga2-0.0.1.tar.gz/download',
+  output  => 'icinga2-0.0.1.tar.gz',
+  flags   => '--prefix=/usr/local/icinga2',
+  creates => '/usr/local/icinga2',
+  make    => 'make && make install',
+  require => Package['boost-devel'],
+  timeout => 600
+}
diff --git a/.vagrant-puppet/modules/cmmi/manifests/init.pp b/.vagrant-puppet/modules/cmmi/manifests/init.pp
index 4a9264ea6..f7069a010 100644
--- a/.vagrant-puppet/modules/cmmi/manifests/init.pp
+++ b/.vagrant-puppet/modules/cmmi/manifests/init.pp
@@ -11,6 +11,7 @@
 #   [*flags*]       - configure options.
 #   [*creates*]     - target directory the software will install to.
 #   [*make* ]       - command to make and make install the software.
+#   [*timeout* ]    - timeout for the make command.
 #
 # Actions:
 #
@@ -32,6 +33,7 @@ define cmmi(
   $flags,
   $creates,
   $make,
+  $timeout=300
 ) {
 
   Exec { path => '/bin:/usr/bin' }
@@ -70,6 +72,7 @@ define cmmi(
     cwd     => $src,
     command => $make,
     creates => $creates,
-    require => Exec["configure-${name}"]
+    require => Exec["configure-${name}"],
+    timeout => $timeout
   }
 }
diff --git a/README.md b/README.md
index 911e69e51..d36732537 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ After you should be able to browse [localhost:8080/icinga2-web](http://localhost
 
 * Icinga 1.9.1 with IDOUtils using a MySQL database
 * Icinga 1.9.1 with IDOUtils using a PostgreSQL database
+* Icinga 2 version 0.0.1
 
 **Installed files**:
 
@@ -176,3 +177,12 @@ In order to run all tests you have to execute the following commands:
 
 `runtests` will execute unit and regression tests and `checkswag` will report
 code style issues.
+
+#### Icinga 2
+
+**Installation path**: `/usr/local/icinga2`
+
+**Example usage**:
+
+    cd /usr/local/icinga2
+    ./sbin/icinga2 -c etc/icinga2/icinga2.conf.dist