diff --git a/Rakefile b/Rakefile
index 1c7f4c8..c7c5cb4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,7 +13,7 @@ def name
 end
 
 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line = File.read("lib/#{name}/version.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
@@ -138,7 +138,7 @@ end
 
 desc "Validate #{gemspec_file}"
 task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}", "lib/generators", "lib/tasks"]
   unless libfiles.empty?
     puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
     exit!
diff --git a/hearsay.gemspec b/hearsay.gemspec
index bb8a14b..3d66697 100644
--- a/hearsay.gemspec
+++ b/hearsay.gemspec
@@ -5,8 +5,6 @@
 ## You can find comprehensive Gem::Specification documentation, at
 ## http://docs.rubygems.org/read/chapter/20
 
-require "hearsay/version"
-
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
@@ -16,9 +14,9 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'hearsay'
-  s.version           = Hearsay::VERSION
+  s.version           = '0.0.1'
   s.date              = '2012-01-23'
-  # s.rubyforge_project = 'NAME'
+  # s.rubyforge_project = 'hearsay'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -50,7 +48,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('DEPNAME', [">= 1.1.0", "< 2.0.0"])
+  # s.add_dependency('DEPNAME', [">= 1.1.0", "< 2.0.0"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -61,7 +59,56 @@ Gem::Specification.new do |s|
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
-  s.files = %w[]
+  s.files = %w[
+    Gemfile
+    MIT-LICENSE
+    README.md
+    Rakefile
+    app/models/reference.rb
+    hearsay.gemspec
+    lib/generators/hearsay_generator.rb
+    lib/generators/templates/hearsay_create_references.rb
+    lib/hearsay.rb
+    lib/hearsay/acts.rb
+    lib/hearsay/acts/referenceable.rb
+    lib/hearsay/acts/referencer.rb
+    lib/hearsay/engine.rb
+    lib/hearsay/version.rb
+    lib/tasks/hearsay_tasks.rake
+    test/dummy/Rakefile
+    test/dummy/app/assets/javascripts/application.js
+    test/dummy/app/assets/stylesheets/application.css
+    test/dummy/app/controllers/application_controller.rb
+    test/dummy/app/helpers/application_helper.rb
+    test/dummy/app/mailers/.gitkeep
+    test/dummy/app/models/.gitkeep
+    test/dummy/app/views/layouts/application.html.erb
+    test/dummy/config.ru
+    test/dummy/config/application.rb
+    test/dummy/config/boot.rb
+    test/dummy/config/database.yml
+    test/dummy/config/environment.rb
+    test/dummy/config/environments/development.rb
+    test/dummy/config/environments/production.rb
+    test/dummy/config/environments/test.rb
+    test/dummy/config/initializers/backtrace_silencers.rb
+    test/dummy/config/initializers/inflections.rb
+    test/dummy/config/initializers/mime_types.rb
+    test/dummy/config/initializers/secret_token.rb
+    test/dummy/config/initializers/session_store.rb
+    test/dummy/config/initializers/wrap_parameters.rb
+    test/dummy/config/locales/en.yml
+    test/dummy/config/routes.rb
+    test/dummy/lib/assets/.gitkeep
+    test/dummy/log/.gitkeep
+    test/dummy/public/404.html
+    test/dummy/public/422.html
+    test/dummy/public/500.html
+    test/dummy/public/favicon.ico
+    test/dummy/script/rails
+    test/hearsay_test.rb
+    test/test_helper.rb
+  ]
   # = MANIFEST =
 
   ## Test files will be grabbed from the file list. Make sure the path glob