diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index dc19204..4a294e7 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -31,6 +31,41 @@ namespace Checkpoints
         (500,   uint256("0x2c466a0880392682f04113dfaa4162d177f44ae3e82c19ac5c19fb716c3e7f25") )
         (1000,   uint256("0x63b6f788a8b32162391cdb7d55a3d0637b01f133b574826dba55f695ed74f346") )
         (1888,   uint256("0xf30f3a77401a047f7bb57c12922801904fcb9db0627d920cfdc793345d893bca") )
+        (5888,   uint256("0xa30423e3dc4c4dbea0982ddd8265fb8f9479e628c884df0a9d0894a1acd1c2ad") )
+        (10888,   uint256("0xc8cb2410bafd7a3beb1ffb417c2ceb853d4b366129b6bcddef425543c26a31d2") )
+        (15888,   uint256("0x7c991bfa551461e61fa65b4ec0aa6e4382f56aac44cdb4fb47b06d9a168eb99e") )
+        (20888,   uint256("0xc1303c76d305ba3c39cc9012b8c8a03ad377469ca979c8f37934c06c5e9d24cf") )
+        (25888,   uint256("0x5a43f61c777087e98501e35a451620ddc386cf8fdbb06a5648a8d6de3504633f") )
+        (30888,   uint256("0x1e47144a80b6eb18bded8050c503a50cddbcd62264c7172c7669c37cf93f83fa") )
+        (35888,   uint256("0xe9f87a9cfe8469273e7c95698d3ac11d25d9a951ee6e351799cf3c30022614e6") )
+        (40888,   uint256("0xb9c0b773fb39d9d0f87b4582bfcdde0cd0617613c88c9acbcc85873671e8e084") )
+        (45888,   uint256("0x90045d251d4bee3118e9437e2b87a1fabfa39d208349e2c21918924548f5aa41") )
+        (50888,   uint256("0x7e86da3a1e130a64c809ac18adceca56ab1abef29e6baabdb2f4a11534aae565") )
+        (55888,   uint256("0x020d531952222426c2d8a0c81fb11a29a21a328d7c495e45609aa629f872ca8c") )
+        (60888,   uint256("0x5ea9bb74858bb1f5018745b984d53cc39865a7188165a711d13a3b47b1016e5c") )
+        (65888,   uint256("0x40f861b9d91a31328eafd4877ff1eca38642ec0782fde53897593170cdaa7ba1") )
+        (70888,   uint256("0xc3332f08009d92e293b370f2ca812197bad7136eebabe5943d69867a4e2edddd") )
+        (75888,   uint256("0x1e0657c2ff7afe3934b78526387151fe30162a25c31af36c5e40d82f2fa7041e") )
+        (80888,   uint256("0x81e206e4e79133f53b47e2bd05e6ab821762cbcd42c38a7b022fc037f3f779d7") )
+        (85888,   uint256("0xf675bf38ff344548b13f5d03dedae71f3df03bbeec55c0121897880218059be7") )
+        (90888,   uint256("0xd69b844fd55c224d264832fcc3563e91c06dd76e9ec656d1838787b5af10ea0c") )
+        (95888,   uint256("0x822017c43266ab26e3808eb5b8107f61c33a85f872a7e03ff2d62708d74a8248") )
+        (100888,   uint256("0x8bd81ad8fd8adf300e2ca446345b739522997eeabd25eed6285c8a6ae865a0e7") )
+        (105888,   uint256("0x5ec8ab091b46f55d550ae5701750d19c7cfacadb23214e5c45a44e9669157144") )
+        (110888,   uint256("0xbbd4652282ff2e1357acd314e0fffa248b17fbd228c205d20fd03a612b496405") )
+        (115888,   uint256("0x1083381767d312daaa1b9a04f639e211a69bb752aff3fe38fd646da5b1785768") )
+        (120888,   uint256("0xc23a9e5edd28a9707a75fef4e04ec83506b5718a4f0d7ad9d9094cf07bddf28b") )
+        (125888,   uint256("0x17cae0c0ad6aa12490407a4229b447953cf75001c01338fd5a3e018c6fb8ecc7") )
+        (130888,   uint256("0x1b1bb84f19fb585b9e254beaebd10016d09ddaa5fde5c2791164e2042239ac3e") )
+        (135888,   uint256("0x5288541c55a83288f9fb126909a7b846063d8b660d8909f1ee132e5c2f87dce1") )
+        (140888,   uint256("0xc4ca655fa7d433493b38713774aabfe43bc2487860e3a6334bae0c9bf0b21cce") )
+        (145888,   uint256("0xbfca8e8b72edfad0aa0a692bc210add2ac61b051a1e80474fc89c8400fbede4d") )
+        (150888,   uint256("0xb3ee8f03843b39efb04903311c8be7fa02a37eb685ca07fab3ab1432bf47ecf3") )
+        (155888,   uint256("0x19252e5956ede01f8ce0da33bffd46bd37148c73c55567e2d1bc052596b0bafb") )
+        (160888,   uint256("0x5ff9c101455c255b0be393e58079674c17db1c921693620b7c0945a9866b0cf0") )
+        (165888,   uint256("0x8021ba373e2246692f757f0b733da4f6058bcb0f4ec90910c18d3dc815519133") )
+        (170888,   uint256("0xce6d825c0c7e56c28ba762370106ee5c6642eb4c08a6b43aa288de3c12586e37") )
+        (173050,   uint256("0x50ed33887ccde04cca982e86ae2073cb7884416b346f8f5289e9f8b64d33776f") )
     ;
 
     // TestNet has no checkpoints
diff --git a/src/clientversion.h b/src/clientversion.h
index 582a017..8f4951e 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -7,7 +7,7 @@
 
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       2
-#define CLIENT_VERSION_MINOR       0
+#define CLIENT_VERSION_MINOR       2
 #define CLIENT_VERSION_REVISION    0
 #define CLIENT_VERSION_BUILD       0
 
diff --git a/src/main.h b/src/main.h
index 2497a5c..059ccec 100644
--- a/src/main.h
+++ b/src/main.h
@@ -71,7 +71,7 @@ static const unsigned int MAX_P2SH_SIGOPS = 15;
 /** The maximum number of sigops we're willing to relay/mine in a single tx */
 static const unsigned int MAX_TX_SIGOPS = MAX_BLOCK_SIGOPS/5;
 /** The maximum number of orphan transactions kept in memory */
-static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100;
+static const unsigned int MAX_ORPHAN_TRANSACTIONS = 10000;
 /** Default for -maxorphanblocks, maximum number of orphan blocks kept in memory */
 static const unsigned int DEFAULT_MAX_ORPHAN_BLOCKS = 750;
 /** The maximum number of entries in an 'inv' protocol message */