diff --git a/NEWS b/NEWS
index 3b81f09..6c63caa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 2.2 - Apr 2, 2012
+
+- Add an optimized SHA-256d algorithm, with specialized code
+  for x86 and x86-64 and support for AVX and XOP instructions
+- Slight performance increase for scrypt on x86 and x86-64
+- The default timeout is now 270 seconds
+
 Version 2.1.5 - Mar 7, 2012
 
 - Add optimizations for AVX-capable x86-64 processors
diff --git a/README b/README
index f479f44..bbb5296 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is a multi-threaded CPU miner for Litecoin, fork of Jeff Garzik's
-reference cpuminer.
+This is a multi-threaded CPU miner for Litecoin and Bitcoin,
+fork of Jeff Garzik's reference cpuminer.
 
 License: GPLv2.  See COPYING for details.
 
diff --git a/configure.ac b/configure.ac
index 7a4ccf5..8f7fff3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([cpuminer], [2.1.5])
+AC_INIT([cpuminer], [2.2])
 
 AC_PREREQ([2.59c])
 AC_CANONICAL_SYSTEM
diff --git a/cpu-miner.c b/cpu-miner.c
index dea8348..8652851 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -550,7 +550,7 @@ static void *miner_thread(void *userdata)
 		      - time(NULL);
 		max64 *= thr_hashrates[thr_id];
 		if (max64 <= 0)
-			max64 = opt_algo == ALGO_SCRYPT ? 0xfffLL : 0xfffffLL;
+			max64 = opt_algo == ALGO_SCRYPT ? 0xfffLL : 0x1fffffLL;
 		if (work.data[19] + max64 > end_nonce)
 			max_nonce = end_nonce;
 		else