diff --git a/CHANGELOG b/CHANGELOG.md
similarity index 94%
rename from CHANGELOG
rename to CHANGELOG.md
index 5ff4311f7..10148823a 100644
--- a/CHANGELOG
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-== 0.3.0
+# 0.3.0
 
 * updated to use v1 of the discovery API
 * updated to use httpadapter 1.0.0
@@ -8,7 +8,7 @@
 * fixed a few deprecation warnings from dependencies
 * added gemspec to source control
 
-== 0.2.0
+# 0.2.0
 
 * updated to use v1 of the discovery API
 * updated to use httpadapter 1.0.0
@@ -16,21 +16,21 @@
 * renamed some switches in the command line tool
 * added additional configuration capabilities
 
-== 0.1.3
+# 0.1.3
 
 * added support for manual overrides of the discovery URI
 * added support for manual overrides of the API base
 * added support for xoauth_requestor_id
 
-== 0.1.2
+# 0.1.2
 
 * added support for two-legged OAuth
 * moved some development dependencies into runtime
 
-== 0.1.1
+# 0.1.1
 
 * substantial improvements to the command line interface
 
-== 0.1.0
+# 0.1.0
 
 * initial release
diff --git a/tasks/git.rake b/tasks/git.rake
index e0a0eb1b0..b1f50c46c 100644
--- a/tasks/git.rake
+++ b/tasks/git.rake
@@ -10,7 +10,7 @@ namespace :git do
 
     desc 'Create a new tag in the Git repository'
     task :create do
-      changelog = File.open('CHANGELOG', 'r') { |file| file.read }
+      changelog = File.open('CHANGELOG.md', 'r') { |file| file.read }
       puts '-' * 80
       puts changelog
       puts '-' * 80
diff --git a/tasks/rdoc.rake b/tasks/rdoc.rake
index ef3e00803..7217194ae 100644
--- a/tasks/rdoc.rake
+++ b/tasks/rdoc.rake
@@ -6,6 +6,10 @@ rescue Gem::LoadError
 end unless defined?(RDoc)
 
 require 'rdoc/task'
+require 'rake/clean'
+
+CLOBBER.include('doc', 'ri')
+CLOBBER.uniq!
 
 namespace :doc do
   desc 'Generate RDoc documentation'
@@ -15,7 +19,7 @@ namespace :doc do
     rdoc.options << '--line-numbers' << 'cattr_accessor=object' <<
       '--charset' << 'utf-8'
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-    rdoc.rdoc_files.include('README.md', 'CHANGELOG', 'LICENSE')
+    rdoc.rdoc_files.include('README.md', 'CHANGELOG.md', 'LICENSE')
     rdoc.rdoc_files.include('lib/**/*.rb')
   end
 
@@ -23,11 +27,4 @@ namespace :doc do
   task :ri do
     sh 'rdoc --ri -o ri .'
   end
-
-  desc 'Remove ri products'
-  task :clobber_ri do
-    rm_r 'ri' rescue nil
-  end
 end
-
-task 'clobber' => ['doc:clobber_rdoc', 'doc:clobber_ri']