diff --git a/Rakefile b/Rakefile
index dd8cd638..45e49fb0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -37,15 +37,17 @@ author="Zed A. Shaw"
 name="mongrel"
 scripts=['mongrel_rails']
 
-setup_gem(name, version,  author, summary, ['mongrel_rails'], test_file) do |spec|
+setup_gem(name, version,  author, summary, scripts, test_file) do |spec|
   spec.add_dependency('daemons', '>= 0.4.2')
 end
 
 desc "Build a binary gem for Win32"
-task :win32_gem => [:clean, :compile, :test, :package_win32]
+task :win32_gem => [:clean, :compile, :test, :rerdoc, :package_win32]
 
+scripts_win32 = scripts + ['mongrel_rails_service','mongrel_rails_svc']
 task :package_win32 do
-  setup_win32_gem(name, version,  version, summary, scripts, test_file) do |spec|
+  setup_win32_gem(name, version,  version, summary, scripts_win32, test_file) do |spec|
+    spec.add_dependency('win32-service', '>= 0.5.0')
     spec.files << 'ext/http11/http11.so'
     spec.extensions = []
     spec.platform = Gem::Platform::WIN32
diff --git a/examples/mongrel_rails_service.rb b/bin/mongrel_rails_service
similarity index 95%
rename from examples/mongrel_rails_service.rb
rename to bin/mongrel_rails_service
index a0c44540..5478de1b 100644
--- a/examples/mongrel_rails_service.rb
+++ b/bin/mongrel_rails_service
@@ -1,5 +1,5 @@
 ###############################################
-# mongrel_rails_service.rb
+# mongrel_rails_service
 #
 # Control script for Rails powered by Mongrel
 #
@@ -123,7 +123,7 @@ class InstallCommand < Mongrel::Command::Command
     binary_path << '"' << Config::CONFIG['bindir'] << '/ruby.exe' << '" '
     
     # add service_script
-    service_script = File.expand_path(File.dirname(__FILE__) + '/mongrel_rails_svc.rb')
+    service_script = File.expand_path(File.dirname(__FILE__) + '/mongrel_rails_svc')
     binary_path << '"' << service_script << '" '
     
     # now add the parameters to it.
diff --git a/examples/mongrel_rails_svc.rb b/bin/mongrel_rails_svc
similarity index 96%
rename from examples/mongrel_rails_svc.rb
rename to bin/mongrel_rails_svc
index 1ce87816..0b270c9c 100644
--- a/examples/mongrel_rails_svc.rb
+++ b/bin/mongrel_rails_svc
@@ -1,5 +1,5 @@
 ###############################################
-# mongrel_rails_svc.rb
+# mongrel_rails_svc
 #
 # This is where Win32::Daemon resides.
 ###############################################