diff --git a/app/models/chunks/engines.rb b/app/models/chunks/engines.rb
index 15b19fe6..3b8a7616 100644
--- a/app/models/chunks/engines.rb
+++ b/app/models/chunks/engines.rb
@@ -1,4 +1,4 @@
-$: << File.dirname(__FILE__) + "../../libraries"
+$: << File.dirname(__FILE__) + "../../lib"
 
 require 'redcloth'
 require 'rdocsupport'
diff --git a/instiki.gemspec b/instiki.gemspec
index aaf23ec8..d2b5e22d 100755
--- a/instiki.gemspec
+++ b/instiki.gemspec
@@ -1,4 +1,4 @@
-$__instiki_source_patterns = ['[A-Z]*', 'instiki', 'app/**/*', 'libraries/**/*', 'vendor/**/*']
+$__instiki_source_patterns = ['[A-Z]*', 'instiki', 'app/**/*', 'lib/**/*', 'vendor/**/*']
 
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
@@ -29,12 +29,12 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('RedCloth', '= 2.0.11')
   s.add_dependency('rubyzip', '= 0.5.5')
   s.requirements << 'none'
-  s.require_path = 'libraries'
+  s.require_path = 'lib'
 
   s.files = $__instiki_source_patterns.inject([]) { |list, glob|
   	list << Dir[glob].delete_if { |path|
       File.directory?(path) or
-      path.include?('CVS/') or 
+      path.include?('.svn/') or 
       path.include?('vendor/') or 
       path.include?('test/') or
       path.include?('_test.rb')
diff --git a/rakefile.rb b/rakefile.rb
index 7fb51043..cdeeb542 100755
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -115,11 +115,11 @@ CLEAN << 'pkg' << 'storage/2500' << 'doc' << 'html'
 begin
   require 'rubygems'
   require 'rake/gempackagetask'
-rescue Exception
+rescue Exception => e
   nil
 end
 
-if defined? GemPackageTask
+if defined? Rake::GemPackageTask
   gemspec = eval(File.read('instiki.gemspec'))
   Rake::GemPackageTask.new(gemspec) do |p|
     p.gem_spec = gemspec