diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp
index 7db63d9..8509afa 100644
--- a/ejabberd/manifests/init.pp
+++ b/ejabberd/manifests/init.pp
@@ -82,8 +82,6 @@ class ejabberd(
     $ldap_password=undef
 ) {
 
-    require erlang
-
     include user::system
     realize(User["ejabberd"], Group["ejabberd"])
 
@@ -104,9 +102,19 @@ class ejabberd(
     }
 
     if $package and versioncmp($package, "ejabberd-13.10") >= 0 {
+        if $::operatingsystem != 'CentOS' {
+            fail("ejabberd ${package} not supported on ${::operatingsystem}")
+        }
         $config = "ejabberd.yml"
+        $erlang_solutions = true
     } else {
         $config = "ejabberd.cfg"
+        $erlang_solutions = false
+    }
+
+    class { "erlang":
+        erlang_solutions => $erlang_solutions,
+        before           => Package["ejabberd"],
     }
 
     if $collab == true {