diff --git a/README.md b/README.md
index bfabe9c8..dcd07852 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ P2Pool Server Node software for Scrypt-N coins. Currently supported:
 * TenfiveCoin [10-5]
 * Spaincoin [SPA]
 * Rotocoin [RT2]
+* Kimocoin [KMC]
 
 
 Requirements:
@@ -119,6 +120,10 @@ Spaincoin:
 * Run P2Pool with the "--net spaincoin" option.
 * Run your miner program, connecting to 127.0.0.1 on port 26490.
 
+Kimocoin:
+* Run P2Pool with the "--net kimocoin" option.
+* Run your miner program, connecting to 127.0.0.1 on port 2891.
+
 
 Sponsors:
 -------------------------
diff --git a/p2pool/bitcoin/networks.py b/p2pool/bitcoin/networks.py
index 877ab09d..a618a9ef 100644
--- a/p2pool/bitcoin/networks.py
+++ b/p2pool/bitcoin/networks.py
@@ -264,6 +264,7 @@ def check_genesis_block(bitcoind, genesis_block_hash):
         DUST_THRESHOLD=0.03e8,
     ),
     
+<<<<<<< HEAD
     caishen=math.Object(
         P2P_PREFIX='fabfb5da'.decode('hex'),
         P2P_PORT=14260,
@@ -281,6 +282,25 @@ def check_genesis_block(bitcoind, genesis_block_hash):
         BLOCK_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/block/',
         ADDRESS_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/address/',
         TX_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/tx/',
+=======
+    kimocoin=math.Object(
+        P2P_PREFIX='6b696d6f'.decode('hex'),
+        P2P_PORT=1889,
+        ADDRESS_VERSION=46,
+        RPC_PORT=1988,
+        RPC_CHECK=defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
+            'kimocoinaddress' in (yield bitcoind.rpc_help()) and
+            not (yield bitcoind.rpc_getinfo())['testnet']
+        )),
+        SUBSIDY_FUNC=lambda h: int(h+1 if h < 100e3 else 100e3-((h-99999)//10e3)*10e3 if h < 150e3 else 50e3-((h+1)-150e3) if h < 195e3 else 5e3)*100000000,
+        POW_FUNC=lambda data: pack.IntType(256).unpack(__import__('vtc_scrypt').getPoWHash(data)),
+        BLOCK_PERIOD=60, # s
+        SYMBOL='KMC',
+        CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'kimocoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/kimocoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.kimocoin'), 'kimocoin.conf'),
+        BLOCK_EXPLORER_URL_PREFIX='http://explorer.kimocoin.com/block/',
+        ADDRESS_EXPLORER_URL_PREFIX='http://explorer.kimocoin.com/address/',
+        TX_EXPLORER_URL_PREFIX='http://explorer.kimocoin.com/tx/',
+>>>>>>> e57e3b4e2b56d308241f488ec1afb8d3345998c3
         SANE_TARGET_RANGE=(2**256//1000000000 - 1, 2**256//1000 - 1),
         DUMB_SCRYPT_DIFF=2**16,
         DUST_THRESHOLD=0.03e8,
diff --git a/p2pool/networks.py b/p2pool/networks.py
index cf6d2001..65d183e2 100644
--- a/p2pool/networks.py
+++ b/p2pool/networks.py
@@ -199,7 +199,26 @@
         ANNOUNCE_CHANNEL='#p2pool-spa',
         VERSION_CHECK=lambda v: True,
         VERSION_WARNING=lambda v: 'Upgrade Spaincoin to >=0.8.8.0!' if v < 80800 else None,
-    ),                                                                                                                                                                         
+    ),
+    
+    kimocoin=math.Object(
+        PARENT=networks.nets['kimocoin'],
+        SHARE_PERIOD=10, # seconds
+        CHAIN_LENGTH=24*60*60//30, # shares
+        REAL_CHAIN_LENGTH=24*60*60//30, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=15, # blocks
+        IDENTIFIER='f8d4d7035c692d35'.decode('hex'),
+        PREFIX='de83d31b55d8fd0e'.decode('hex'),
+        P2P_PORT=2890,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**20 - 1,
+        PERSIST=True,
+        WORKER_PORT=2891,
+        BOOTSTRAP_ADDRS='kmc.1js.us'.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-alt',
+        VERSION_CHECK=lambda v: True,
+    ),
 
     caishen=math.Object(
         PARENT=networks.nets['caishen'],