diff --git a/lib/holidays.rb b/lib/holidays.rb
index b4e2968..3b722c7 100644
--- a/lib/holidays.rb
+++ b/lib/holidays.rb
@@ -261,7 +261,7 @@ private
 
     require "holidays/north_america" if regions.include?(:us) # special case for north_america/US cross-linking
 
-    raise UnknownRegionError unless regions.all? { |r| r == :any or @@regions.include?(r) or begin require "holidays/#{r.to_s}"; rescue LoadError; false; end }
+    raise UnknownRegionError unless regions.all? { |r| r == :any or @@regions.include?(r) or begin require "holidays/#{r.to_s.split('_').first}"; rescue LoadError; false; end }
     regions
   end
 
diff --git a/lib/holidays/MANIFEST b/lib/holidays/MANIFEST
index c88f543..db7fffa 100644
--- a/lib/holidays/MANIFEST
+++ b/lib/holidays/MANIFEST
@@ -1,27 +1,28 @@
 ==== Regional definitions
 The following definition files are included in this installation:
 
+* holidays/nyse
+* holidays/no
+* holidays/es
+* holidays/ie
+* holidays/united_nations
 * holidays/au
+* holidays/mx
+* holidays/za
+* holidays/scandinavia
 * holidays/ca
-* holidays/cz
+* holidays/us
+* holidays/nl
+* holidays/it
 * holidays/de
 * holidays/dk
-* holidays/es
+* holidays/cz
+* holidays/nz
+* holidays/ups
+* holidays/pt
 * holidays/europe
+* holidays/se
+* holidays/north_america
 * holidays/fr
 * holidays/gb
-* holidays/ie
 * holidays/is
-* holidays/it
-* holidays/mx
-* holidays/nl
-* holidays/north_america
-* holidays/nyse
-* holidays/nz
-* holidays/pt
-* holidays/scandinavia
-* holidays/se
-* holidays/united_nations
-* holidays/ups
-* holidays/us
-* holidays/za
diff --git a/rakefile.rb b/rakefile.rb
index 68b2844..059c363 100644
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -87,4 +87,18 @@ The following definition files are included in this installation:
       end
     end
   end
-end
\ No newline at end of file
+end
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "wombleton-holidays"
+    gemspec.summary = "A collection of Ruby methods to deal with statutory and other holidays.  You deserve a holiday!"
+    gemspec.description = "A collection of Ruby methods to deal with statutory and other holidays.  You deserve a holiday!"
+    gemspec.email = "wombleton@gmail.com"
+    gemspec.homepage = "http://github.com/wombleton/holidays"
+    gemspec.authors = ["Alex Dunae", "Rowan Crawford"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
+end
diff --git a/wombleton-holidays.gemspec b/wombleton-holidays.gemspec
new file mode 100644
index 0000000..1d0678a
--- /dev/null
+++ b/wombleton-holidays.gemspec
@@ -0,0 +1,156 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile.rb, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{wombleton-holidays}
+  s.version = "0.9.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Alex Dunae", "Rowan Crawford"]
+  s.date = %q{2010-05-01}
+  s.description = %q{A collection of Ruby methods to deal with statutory and other holidays.  You deserve a holiday!}
+  s.email = %q{wombleton@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG",
+     "LICENSE",
+     "README.rdoc",
+     "REFERENCES",
+     "VERSION",
+     "data/SYNTAX",
+     "data/au.yaml",
+     "data/build_defs.rb",
+     "data/ca.yaml",
+     "data/cz.yaml",
+     "data/de.yaml",
+     "data/dk.yaml",
+     "data/es.yaml",
+     "data/fr.yaml",
+     "data/gb.yaml",
+     "data/ie.yaml",
+     "data/index.yaml",
+     "data/is.yaml",
+     "data/it.yaml",
+     "data/mx.yaml",
+     "data/nl.yaml",
+     "data/no.yaml",
+     "data/north_america_informal.yaml",
+     "data/nyse.yaml",
+     "data/nz.yaml",
+     "data/pt.yaml",
+     "data/se.yaml",
+     "data/united_nations.yaml",
+     "data/ups.yaml",
+     "data/us.yaml",
+     "data/za.yaml",
+     "holidays.gemspec",
+     "lib/holidays.rb",
+     "lib/holidays/MANIFEST",
+     "lib/holidays/au.rb",
+     "lib/holidays/ca.rb",
+     "lib/holidays/cz.rb",
+     "lib/holidays/de.rb",
+     "lib/holidays/dk.rb",
+     "lib/holidays/es.rb",
+     "lib/holidays/europe.rb",
+     "lib/holidays/fr.rb",
+     "lib/holidays/gb.rb",
+     "lib/holidays/ie.rb",
+     "lib/holidays/is.rb",
+     "lib/holidays/it.rb",
+     "lib/holidays/mx.rb",
+     "lib/holidays/nl.rb",
+     "lib/holidays/no.rb",
+     "lib/holidays/north_america.rb",
+     "lib/holidays/nyse.rb",
+     "lib/holidays/nz.rb",
+     "lib/holidays/pt.rb",
+     "lib/holidays/scandinavia.rb",
+     "lib/holidays/se.rb",
+     "lib/holidays/united_nations.rb",
+     "lib/holidays/ups.rb",
+     "lib/holidays/us.rb",
+     "lib/holidays/za.rb",
+     "rakefile.rb",
+     "test/defs/test_defs_au.rb",
+     "test/defs/test_defs_ca.rb",
+     "test/defs/test_defs_cz.rb",
+     "test/defs/test_defs_de.rb",
+     "test/defs/test_defs_dk.rb",
+     "test/defs/test_defs_es.rb",
+     "test/defs/test_defs_europe.rb",
+     "test/defs/test_defs_fr.rb",
+     "test/defs/test_defs_gb.rb",
+     "test/defs/test_defs_ie.rb",
+     "test/defs/test_defs_is.rb",
+     "test/defs/test_defs_it.rb",
+     "test/defs/test_defs_mx.rb",
+     "test/defs/test_defs_nl.rb",
+     "test/defs/test_defs_no.rb",
+     "test/defs/test_defs_north_america.rb",
+     "test/defs/test_defs_nyse.rb",
+     "test/defs/test_defs_nz.rb",
+     "test/defs/test_defs_pt.rb",
+     "test/defs/test_defs_scandinavia.rb",
+     "test/defs/test_defs_se.rb",
+     "test/defs/test_defs_ups.rb",
+     "test/defs/test_defs_us.rb",
+     "test/defs/test_defs_za.rb",
+     "test/test_date.rb",
+     "test/test_helper.rb",
+     "test/test_holidays.rb",
+     "test/test_multiple_regions.rb"
+  ]
+  s.homepage = %q{http://github.com/wombleton/holidays}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{A collection of Ruby methods to deal with statutory and other holidays.  You deserve a holiday!}
+  s.test_files = [
+    "test/test_helper.rb",
+     "test/test_date.rb",
+     "test/test_multiple_regions.rb",
+     "test/defs/test_defs_au.rb",
+     "test/defs/test_defs_no.rb",
+     "test/defs/test_defs_ups.rb",
+     "test/defs/test_defs_nyse.rb",
+     "test/defs/test_defs_scandinavia.rb",
+     "test/defs/test_defs_dk.rb",
+     "test/defs/test_defs_se.rb",
+     "test/defs/test_defs_north_america.rb",
+     "test/defs/test_defs_europe.rb",
+     "test/defs/test_defs_nl.rb",
+     "test/defs/test_defs_fr.rb",
+     "test/defs/test_defs_us.rb",
+     "test/defs/test_defs_it.rb",
+     "test/defs/test_defs_ca.rb",
+     "test/defs/test_defs_mx.rb",
+     "test/defs/test_defs_es.rb",
+     "test/defs/test_defs_de.rb",
+     "test/defs/test_defs_cz.rb",
+     "test/defs/test_defs_pt.rb",
+     "test/defs/test_defs_is.rb",
+     "test/defs/test_defs_nz.rb",
+     "test/defs/test_defs_za.rb",
+     "test/defs/test_defs_gb.rb",
+     "test/defs/test_defs_ie.rb",
+     "test/test_holidays.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+