diff --git a/.document b/.document
new file mode 100644
index 0000000..ecf3673
--- /dev/null
+++ b/.document
@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..00c0b86
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..3fc6876
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,4 @@
+Copyright (c) 2009 Akinori MUSHA
+
+All rights reserved.  You can redistribute and/or modify it under the
+same terms as Ruby.
diff --git a/README.rdoc b/README.rdoc
new file mode 100644
index 0000000..dccd05e
--- /dev/null
+++ b/README.rdoc
@@ -0,0 +1,7 @@
+= ruby-friendfeed
+
+This is a Ruby library to provide access to FriendFeed API's.
+
+== Copyright
+
+Copyright (c) 2009 Akinori MUSHA.  See LICENSE for details.
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..acf339d
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,62 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "friendfeed"
+    gem.summary = %Q{A Ruby library to provide access to FriendFeed API's}
+    gem.description = <<-EOS
+This is a Ruby library to provide access to FriendFeed API's.
+
+It implements official API's as well as unofficial API's to allow
+manipulating friends, groups and services for your personal purposes.
+    EOS
+    gem.email = "knu@idaemons.org"
+    gem.homepage = "http://github.com/knu/ruby-friendfeed"
+    gem.authors = ["Akinori MUSHA"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "friendfeed #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..b1e80bb
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.1.3
diff --git a/friendfeed.gemspec b/friendfeed.gemspec
index 8f70851..ec10c18 100644
--- a/friendfeed.gemspec
+++ b/friendfeed.gemspec
@@ -1,23 +1,56 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
-  s.specification_version = 2
-  s.name = "friendfeed"
+  s.name = %q{friendfeed}
   s.version = "0.1.3"
-  s.required_rubygems_version = Gem::Requirement.new(">= 0")
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akinori MUSHA"]
-  s.date = %q{2009-05-18}
-  s.summary = "A Ruby module that provides access to FriendFeed API's."
-  s.description = s.summary
-  s.email = "knu@idaemons.org"
-  s.homepage = %q{http://github.com/knu/ruby-friendfeed}
-  s.files = %w[
-    lib/friendfeed.rb
-    lib/friendfeed/compat.rb
-    lib/friendfeed/unofficial.rb
-    bin/tw2ff
+  s.date = %q{2009-06-08}
+  s.default_executable = %q{tw2ff}
+  s.description = %q{This is a Ruby library to provide access to FriendFeed API's.
+
+It implements official API's as well as unofficial API's to allow
+manipulating friends, groups and services for your personal purposes.
+}
+  s.email = %q{knu@idaemons.org}
+  s.executables = ["tw2ff"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/tw2ff",
+     "friendfeed.gemspec",
+     "lib/friendfeed.rb",
+     "lib/friendfeed/compat.rb",
+     "lib/friendfeed/unofficial.rb",
+     "test/friendfeed_test.rb",
+     "test/test_helper.rb"
   ]
+  s.homepage = %q{http://github.com/knu/ruby-friendfeed}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.executables = ["tw2ff"]
-  s.has_rdoc = true
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.rubyforge_project = "friendfeed"
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{A Ruby library to provide access to FriendFeed API's}
+  s.test_files = [
+    "test/test_helper.rb",
+     "test/friendfeed_test.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
diff --git a/test/friendfeed_test.rb b/test/friendfeed_test.rb
new file mode 100644
index 0000000..68a6d5c
--- /dev/null
+++ b/test/friendfeed_test.rb
@@ -0,0 +1,6 @@
+require 'test_helper'
+
+class FriendFeedTest < Test::Unit::TestCase
+  def test_dummy
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 0000000..4257a28
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'test/unit'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'friendfeed'
+
+class Test::Unit::TestCase
+end