diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 66b6007c..5002e5a6 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,5 +1,7 @@
 == HEAD
 
+== Version 2.6.4 - Wed Mar 23 08:16 -0700 2016 Jeremy Daer <jeremydaer@gmail.com>
+
 Features:
 * #772 - Normalize encoding matchers (grosser)
 * #775 - Avoid failed encodings / stop bad charsets early (grosser)
diff --git a/MIT-LICENSE b/MIT-LICENSE
index 898f0aa4..88f1de1e 100644
--- a/MIT-LICENSE
+++ b/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2015 Mikel Lindsaar
+Copyright (c) 2009-2016 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/README.md b/README.md
index 602c0077..8606ae28 100644
--- a/README.md
+++ b/README.md
@@ -697,7 +697,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2015 Mikel Lindsaar
+Copyright (c) 2009-2016 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/lib/mail/version.rb b/lib/mail/version.rb
index 9840a88d..84d29c64 100644
--- a/lib/mail/version.rb
+++ b/lib/mail/version.rb
@@ -5,7 +5,7 @@ module Mail
     MAJOR = 2
     MINOR = 6
     PATCH = 4
-    BUILD = 'rc2'
+    BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')