gistfile1.diff

diff --git a/chef-server/bin/chef-server b/chef-server/bin/chef-server
index b6a8277..e7dd8a2 100755
--- a/chef-server/bin/chef-server
+++ b/chef-server/bin/chef-server
@@ -27,6 +27,9 @@ require "chef"
 Dir.chdir File.join(File.dirname(__FILE__),"..")
 __DIR__ = Dir.getwd
 
+slice_source = File.join(File.dirname(__FILE__), "..", "..", "chef-server-slice", "lib", "chef-server-slice.rb")
+require slice_source if File.exists?(slice_source)
+
 if ARGV[0] && ARGV[0] =~ /^[^-]/
   ARGV.push "-H"
 end 
diff --git a/chef-server/config/dependencies.rb b/chef-server/config/dependencies.rb
index 6065aea..79b65e3 100644
--- a/chef-server/config/dependencies.rb
+++ b/chef-server/config/dependencies.rb
@@ -6,4 +6,4 @@ dependency "merb-core", merb_gems_version
 dependency "merb-assets", merb_gems_version  
 dependency "merb-helpers", merb_gems_version 
 dependency "merb-slices", merb_gems_version  
-dependency "chef-server-slice"
+dependency "chef-server-slice" unless Merb::Slices.slice_names.include?("ChefServerSlice")
\ No newline at end of file