diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 5c471ea..59c9bdb 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -7,7 +7,6 @@
 #
 # [*password*]
 #   (Mandatory) Password to connect to the database.
-#   Defaults to 'false'.
 #
 # [*dbname*]
 #   (Optional) Name of the database.
diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp
index 8392c12..90bf492 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -16,13 +16,13 @@
 #   (Optional) User to connect to the database.
 #   Defaults to 'ec2api'.
 #
-#  [*encoding*]
-#    (Optional) The charset to use for the database.
-#    Default to undef.
+# [*encoding*]
+#   (Optional) The charset to use for the database.
+#   Default to undef.
 #
-#  [*privileges*]
-#    (Optional) Privileges given to the database user.
-#    Default to 'ALL'
+# [*privileges*]
+#   (Optional) Privileges given to the database user.
+#   Default to 'ALL'
 #
 # == Dependencies
 #
diff --git a/manifests/init.pp b/manifests/init.pp
index 4d656c4..a6896c0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,11 +4,29 @@
 #
 # === Parameters
 #
-# [*sample_parameter*]
-#   Explanation of what this parameter affects and what it defaults to.
+# [*package_ensure*]
+#    (Optional) Ensure state for package.
+#    Defaults to 'present'
 #
-class ec2api {
+# [*package_manage*]
+#    (Optional) Activate/deactivate ec2api package installation.
+#    Defaults to true
+#
+#
+class ec2api (
+  $package_ensure = 'present',
+  $package_manage = true,
+){
+  if $package_manage {
+    package { 'ec2api':
+      ensure => $package_ensure,
+      name   => $::ec2api::params::package_manage,
+    }
 
-  include ::ec2api::params
+    Package['ec2api'] ->
+    File <| title == 'ec2-api-config-file' |>
 
+    Package['ec2api'] ->
+    File <| title == 'ec2-api-paste-ini-file' |>
+  }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index b1c6b71..5ad9444 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -16,4 +16,6 @@ class ec2api::params {
     }
 
   } # Case $::osfamily
+
+  $package_name = 'openstack-ec2-api'
 }