diff --git a/.vagrant-puppet/files/etc/icinga2/features-available/ido-pgsql.conf b/.vagrant-puppet/modules/icinga2_pgsql/files/features-available/ido-pgsql.conf
similarity index 100%
rename from .vagrant-puppet/files/etc/icinga2/features-available/ido-pgsql.conf
rename to .vagrant-puppet/modules/icinga2_pgsql/files/features-available/ido-pgsql.conf
diff --git a/.vagrant-puppet/modules/icinga2_pgsql/manifests/init.pp b/.vagrant-puppet/modules/icinga2_pgsql/manifests/init.pp
new file mode 100644
index 000000000..2326449af
--- /dev/null
+++ b/.vagrant-puppet/modules/icinga2_pgsql/manifests/init.pp
@@ -0,0 +1,17 @@
+class icinga2_pgsql {
+  include icinga2
+  include icinga_packages
+
+  package { 'icinga2-ido-pgsql':
+    ensure  => latest,
+    require => Class['icinga_packages'],
+  }
+  -> pgsql::database::populate { 'icinga2':
+    username   => 'icinga2',
+    password   => 'icinga2',
+    schemafile => '/usr/share/icinga2-ido-pgsql/schema/pgsql.sql',
+  }
+  -> icinga2::feature { 'ido-pgsql':
+    source => 'puppet:///modules/icinga2_pgsql',
+  }
+}