diff --git a/Rakefile b/Rakefile
index c2f44e932..bd1da3990 100644
--- a/Rakefile
+++ b/Rakefile
@@ -54,7 +54,7 @@ file_d $TOOLS_DOWNLOAD_INSTALLER => [$TOOLS_INSTALLER] do
 end
 
 task :objj_gem do
-    #subrake('Tools/Rake', :objj_gem)
+    subrake('Tools/Rake', :objj_gem)
 end
 
 task :tools_download => [$TOOLS_DOWNLOAD_ENV, $TOOLS_DOWNLOAD_EDITORS, $TOOLS_DOWNLOAD_README, $TOOLS_DOWNLOAD_INSTALLER, :objj_gem]
diff --git a/Tools/Rake/Rakefile b/Tools/Rake/Rakefile
index 81ec3bf90..4d1136c87 100644
--- a/Tools/Rake/Rakefile
+++ b/Tools/Rake/Rakefile
@@ -30,18 +30,18 @@ end
 Rake::GemPackageTask.new(spec) do |pkg|
     pkg.need_zip = true
     pkg.need_tar = true
-    pkg.package_dir = File.join($BUILD_DIR, $CONFIGURATION, 'rake')
+    pkg.package_dir = File.join($BUILD_DIR, $CONFIGURATION, 'Rake')
 end
 
 #task :install do
 #    Gem::Installer.new(File.join($BUILD_DIR, $CONFIGURATION, 'rake', 'objective-j-0.7.0.gem')).install
 #end
 
-task :objj_gem do
+task :objj_gem => [:gem] do
   mkdir_p $TOOLS_DOWNLOAD
-  cp(File.join($BUILD_DIR, $CONFIGURATION, 'rake', spec.file_name), File.join($TOOLS_DOWNLOAD, spec.file_name))
+  cp(File.join($BUILD_DIR, $CONFIGURATION, 'Rake', spec.file_name), File.join($TOOLS_DOWNLOAD, spec.file_name))
 end
 
 task :build
 
-CLOBBER.include(File.join($BUILD_DIR, $CONFIGURATION, 'rake'), File.join($TOOLS_DOWNLOAD, spec.file_name))
+CLOBBER.include(File.join($BUILD_DIR, $CONFIGURATION, 'Rake'), File.join($TOOLS_DOWNLOAD, spec.file_name))