diff --git a/gen-pack b/gen-pack
index f9c5c68..b4be4f1 100755
--- a/gen-pack
+++ b/gen-pack
@@ -10,6 +10,7 @@ erb_path      = ARGV[0]
 num_instances = ARGV[1].to_i
 pkg_url       = ARGV[2] || 'http://packages.couchbase.com/releases/1.8.0/couchbase-server-community_x86_1.8.0.rpm'
 pkg_base      = pkg_url.split('/')[-1].split('-')[0] # membase or couchbase
+pkg_ver       = pkg_url.split('/')[-1].split('-')[-1].split('_')[0]  # enterprise or community
 pkg_64        = pkg_url.include?('_64_')
 
 default_instance_type = 'm1.small'
diff --git a/template.erb b/template.erb
index a52cc59..05825cd 100644
--- a/template.erb
+++ b/template.erb
@@ -127,7 +127,7 @@
             "#!/bin/bash -ex","\n",
             "yum -y install openssl098e","\n",
             "wget ", { "Ref" : "PackageURL" },"\n",
-            "rpm -i <%= pkg_base %>-server-community*.rpm","\n",
+            "rpm -i <%= pkg_base %>-server-<%= pkg_ver %>*.rpm","\n",
             "/bin/sh -c \"", { "Ref" : "AfterInstall" }, "\"\n",
             "sleep 5","\n",
             <% if pkg_base == 'couchbase' %>