diff --git a/Makefile b/Makefile
index 1039b1a..50c92bf 100755
--- a/Makefile
+++ b/Makefile
@@ -110,9 +110,13 @@ else ifeq ($(CHAIN),atheios)
 APP_LOAD_PARAMS += --path "44'/1620'"
 DEFINES += CHAINID_UPCASE=\"ATHEIOS\" CHAINID_COINNAME=\"ATH\" CHAIN_KIND=CHAIN_KIND_ATHEIOS CHAIN_ID=1620
 APPNAME = "Atheios"
+else ifeq ($(CHAIN),gochain)
+APP_LOAD_PARAMS += --path "44'/6060'"
+DEFINES += CHAINID_UPCASE=\"GOCHAIN\" CHAINID_COINNAME=\"GO\" CHAIN_KIND=CHAIN_KIND_GOCHAIN CHAIN_ID=60
+APPNAME = "GoChain"
 else
 ifeq ($(filter clean,$(MAKECMDGOALS)),)
-$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem)
+$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain)
 endif
 endif
 
@@ -204,4 +208,4 @@ include $(BOLOS_SDK)/Makefile.rules
 dep/%.d: %.c Makefile
 
 listvariants:
-	@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma # musicoin atheios callisto ethersocial ellaism   ether1 ethergem
+	@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma # musicoin atheios callisto ethersocial ellaism   ether1 ethergem gochain
diff --git a/blue_app_gochain.gif b/blue_app_gochain.gif
new file mode 100644
index 0000000..e72e6fd
Binary files /dev/null and b/blue_app_gochain.gif differ
diff --git a/glyphs/blue_badge_gochain.gif b/glyphs/blue_badge_gochain.gif
new file mode 100644
index 0000000..4a8ea11
Binary files /dev/null and b/glyphs/blue_badge_gochain.gif differ
diff --git a/glyphs/nanos_badge_gochain.gif b/glyphs/nanos_badge_gochain.gif
new file mode 100644
index 0000000..39ed2fb
Binary files /dev/null and b/glyphs/nanos_badge_gochain.gif differ
diff --git a/gochain.png b/gochain.png
new file mode 100644
index 0000000..aeb87a2
Binary files /dev/null and b/gochain.png differ
diff --git a/nanos_app_gochain.gif b/nanos_app_gochain.gif
new file mode 100644
index 0000000..d8cd3cf
Binary files /dev/null and b/nanos_app_gochain.gif differ
diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h
index 79c1636..8696b6c 100644
--- a/src_genericwallet/chainConfig.h
+++ b/src_genericwallet/chainConfig.h
@@ -21,7 +21,8 @@ typedef enum chain_kind_e {
 	CHAIN_KIND_ELLAISM,
 	CHAIN_KIND_ETHER1,
 	CHAIN_KIND_ETHERGEM,
-	CHAIN_KIND_ATHEIOS
+	CHAIN_KIND_ATHEIOS,
+	CHAIN_KIND_GOCHAIN
 } chain_kind_t;
 
 typedef struct chain_config_s {
diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c
index e46de07..00761d4 100644
--- a/src_genericwallet/main.c
+++ b/src_genericwallet/main.c
@@ -1511,6 +1511,9 @@ tokenDefinition_t* getKnownToken() {
         case CHAIN_KIND_ATHEIOS:
             numTokens = NUM_TOKENS_ATHEIOS;
             break;
+        case CHAIN_KIND_GOCHAIN:
+            numTokens = NUM_TOKENS_GOCHAIN;
+            break;
     }
     for (i=0; i<numTokens; i++) {            
         switch(chainConfig->kind) {
@@ -1565,6 +1568,9 @@ tokenDefinition_t* getKnownToken() {
             case CHAIN_KIND_ATHEIOS:
                 currentToken = PIC(&TOKENS_ATHEIOS[i]);
                 break;
+            case CHAIN_KIND_GOCHAIN:
+                currentToken = PIC(&TOKENS_GOCHAIN[i]);
+                break;
         } 
         if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) {
             return currentToken;
diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c
index 00bfa62..4c48350 100644
--- a/src_genericwallet/tokens.c
+++ b/src_genericwallet/tokens.c
@@ -782,3 +782,5 @@ const tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO] = {};
 const tokenDefinition_t const TOKENS_ETHERGEM[NUM_TOKENS_ETHERGEM] = {};
 
 const tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS] = {};
+
+const tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN] = {};
diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h
index 23d9b22..cdb9de6 100644
--- a/src_genericwallet/tokens.h
+++ b/src_genericwallet/tokens.h
@@ -40,6 +40,7 @@ typedef struct tokenDefinition_t {
 #define NUM_TOKENS_CALLISTO 0
 #define NUM_TOKENS_ETHERGEM 0
 #define NUM_TOKENS_ATHEIOS 0
+#define NUM_TOKENS_GOCHAIN 0
 
 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA];
 extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM];
@@ -58,3 +59,4 @@ extern tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN];
 extern tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO];
 extern tokenDefinition_t const TOKENS_ETHERGEM[NUM_TOKENS_ETHERGEM];
 extern tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS];
+extern tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN];