diff --git a/README.md b/README.md
index 5a76d4c4..26ce6533 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ It uses the Arduino Core for ESP8266 framework and a number of 3rd party librari
 
 **Current Release Version is 1.12.1**
 
-Read the [changes log](https://bitbucket.org/xoseperez/espurna/src/master/CHANGELOG.md).
+Read the [changes log](https://github.com/xoseperez/espurna/blob/master/CHANGELOG.md).
 
 ---
 
diff --git a/code/espurna/config/all.h b/code/espurna/config/all.h
index b5fc84d6..3834ba3c 100644
--- a/code/espurna/config/all.h
+++ b/code/espurna/config/all.h
@@ -3,7 +3,7 @@
     the repo files you can either define USE_CUSTOM_H or remove the
 	"#ifdef USE_CUSTOM_H" & "#endif" lines and add a "custom.h"
     file to this same folder.
-    Check https://bitbucket.org/xoseperez/espurna/issues/104/general_customh
+    Check https://github.com/xoseperez/espurna/issues/104
     for an example on how to use this file.
 	(Define USE_CUSTOM_H on commandline for platformio:
 	export PLATFORMIO_BUILD_FLAGS="'-DUSE_CUSTOM_H'" )
diff --git a/code/espurna/libs/WebSocketIncommingBuffer.h b/code/espurna/libs/WebSocketIncommingBuffer.h
index 2c2e30a1..ec0fb8d8 100644
--- a/code/espurna/libs/WebSocketIncommingBuffer.h
+++ b/code/espurna/libs/WebSocketIncommingBuffer.h
@@ -5,8 +5,6 @@ WebSocketIncommingBuffer
 Code by Hermann Kraus (https://bitbucket.org/hermr2d2/)
 and slightly modified.
 
-https://bitbucket.org/xoseperez/espurna/pull-requests/30/safer-buffer-handling-for-websocket-data
-
 */
 
 #pragma once
diff --git a/code/html/index.html b/code/html/index.html
index 35b9d083..7600f0c6 100644
--- a/code/html/index.html
+++ b/code/html/index.html
@@ -146,7 +146,7 @@
                         &copy; 2016-2018<br />
                         Xose Pérez<br/>
                         <a href="http://tinkerman.cat" target="_blank">http://tinkerman.cat</a><br/>
-                        <a href="https://bitbucket.org/xoseperez/espurna" target="_blank">ESPurna @ Bitbucket</a><br/>
+                        <a href="https://github.com/xoseperez/espurna" target="_blank">ESPurna @ GitHub</a><br/>
                         GPLv3 license<br/>
                     </div>