diff --git a/appveyor.yml b/appveyor.yml
index d6561f6a..cc543e0c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,7 @@ test: off
 #- cmd: c:\cygwin\bin\bash ./tools/travis-ci/before_deploy.sh
 deploy:
   #release: openjpeg-$(appveyor_repo_tag_name)
-  description: 'OpenJPEG $(appveyor_repo_tag_name) has been released. More info [here](https://github.com/uclouvain/openjpeg/blob/$(appveyor_repo_tag_name)/NEWS) and a detailed view [here](https://github.com/uclouvain/openjpeg/blob/$(appveyor_repo_tag_name)/CHANGES).'
+  description: 'OpenJPEG $(appveyor_repo_tag_name) has been released. More info [here](https://github.com/thinkoid/openjpeg/blob/$(appveyor_repo_tag_name)/NEWS) and a detailed view [here](https://github.com/thinkoid/openjpeg/blob/$(appveyor_repo_tag_name)/CHANGES).'
   provider: GitHub
   auth_token:
     secure: XUL+IoRRw8U/4tupa/fMpinxurft7WRQHZiWHMLO5iuFbwZ+C3vCjVVVM+5Ebky7 # your encrypted token from GitHub
diff --git a/tools/abi-tracker/openjpeg.json b/tools/abi-tracker/openjpeg.json
index 9f091f7f..c8c34b2d 100644
--- a/tools/abi-tracker/openjpeg.json
+++ b/tools/abi-tracker/openjpeg.json
@@ -1,8 +1,8 @@
 {
   "Name":           "openjpeg",
   "Title":          "OpenJPEG",
-  "SourceUrl":      "https://github.com/uclouvain/openjpeg/tags",
-  "Git":            "https://github.com/uclouvain/openjpeg.git",
+  "SourceUrl":      "https://github.com/thinkoid/openjpeg/tags",
+  "Git":            "https://github.com/thinkoid/openjpeg.git",
   "Maintainer":     "OpenJPEG team",
   "MaintainerUrl":  "http://www.openjpeg.org/",
   "Configure":      "-DCMAKE_C_FLAGS='-fvisibility=hidden -g -Og -w -fpermissive'",
diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh
index f86c7028..952d6e27 100755
--- a/tools/travis-ci/abi-check.sh
+++ b/tools/travis-ci/abi-check.sh
@@ -31,7 +31,7 @@ if [ "${OPJ_PREVIOUS_VERSION:-}" != "" ]; then
 else
 	OPJ_LIMIT_ABI_BUILDS="-limit 2"
 fi
-OPJ_REPO="https://github.com/uclouvain/openjpeg.git"
+OPJ_REPO="https://github.com/thinkoid/openjpeg.git"
 OPJ_SSH_REPO=${OPJ_REPO/https:\/\/github.com\//git@github.com:}
 OPJ_UPLOAD_BRANCH="gh-pages"
 OPJ_UPLOAD_DIR="abi-check"
diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh
index 3539b821..2f97c863 100755
--- a/tools/travis-ci/install.sh
+++ b/tools/travis-ci/install.sh
@@ -54,12 +54,12 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
 	else
 		OPJ_DATA_BRANCH=$(git -C ${OPJ_SOURCE_DIR} branch | grep '*' | tr -d '*[[:blank:]]') #default to same branch as we're setting up
 	fi
-	OPJ_DATA_HAS_BRANCH=$(git ls-remote --heads git://github.com/uclouvain/openjpeg-data.git ${OPJ_DATA_BRANCH} | wc -l)
+	OPJ_DATA_HAS_BRANCH=$(git ls-remote --heads git://github.com/thinkoid/openjpeg-data.git ${OPJ_DATA_BRANCH} | wc -l)
 	if [ ${OPJ_DATA_HAS_BRANCH} -eq 0 ]; then
 		OPJ_DATA_BRANCH=master #default to master
 	fi
 	echo "Cloning openjpeg-data from ${OPJ_DATA_BRANCH} branch"
-	git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/uclouvain/openjpeg-data.git data
+	git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/thinkoid/openjpeg-data.git data
 
 	# We need jpylyzer for the test suite
     JPYLYZER_VERSION="1.17.0"    
diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh
index 97f5f712..e8485a58 100755
--- a/tools/travis-ci/run.sh
+++ b/tools/travis-ci/run.sh
@@ -369,7 +369,7 @@ if [ "${OPJ_CI_PERF_TESTS:-}" == "1" ]; then
         REF_VERSION=v2.1.2
     fi
     if [ ! -d ref_opj ]; then
-        git clone https://github.com/uclouvain/openjpeg ref_opj
+        git clone https://github.com/thinkoid/openjpeg ref_opj
     fi
     echo "Building reference version (${REF_VERSION})"
     cd ref_opj