diff --git a/ChangeLog.markdown b/ChangeLog.markdown
index d7a1447..1f5b143 100644
--- a/ChangeLog.markdown
+++ b/ChangeLog.markdown
@@ -1,3 +1,8 @@
+# 3.0.0
+
+ * Renamed 'link' to 'symlink'
+ * Fixed conflict resolution when symlink destination exists and is a normal file
+
 # 2.0.0
 
  * Better support for recognizing git urls (thanks jacobat!)
diff --git a/Rakefile b/Rakefile
index 922b73d..3815209 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.email = "josh@technicalpickles.com"
   gem.homepage = "http://github.com/technicalpickles/homesick"
   gem.authors = ["Joshua Nichols"]
-  gem.version = "0.2.0"
+  gem.version = "0.3.0"
   # Have dependencies? Add them to Gemfile
 
   # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings