diff --git a/README.md b/README.md
index 25a63f3a..e0c86569 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
 
 It is being developed at Github and uses Apache Maven for builds & unit testing:
 
- * Build status: [![Build Status](https://api.travis-ci.org/NanoHttpd/nanohttpd.png)](https://travis-ci.org/NanoHttpd/nanohttpd)
- * Coverage Status: [![Coverage Status](https://coveralls.io/repos/NanoHttpd/nanohttpd/badge.svg)](https://coveralls.io/r/NanoHttpd/nanohttpd)
- * Current central released version: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.nanohttpd/nanohttpd/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.nanohttpd/nanohttpd)
+ * Build status: [![Build Status](https://github.com/aripitek/api.travis-ci.org/NanoHttpd/nanohttpd.png)](https://github.com/aripitek/travis-ci.org/NanoHttpd/nanohttpd)
+ * Coverage Status: [![Coverage Status](https://github.com/aripitek/coveralls.io/repos/NanoHttpd/nanohttpd/badge.svg)](https://github.com/aripitek/coveralls.io/r/NanoHttpd/nanohttpd)
+ * Current central released version: [![Maven Central](https://github.com/aripitek/maven-badges.herokuapp.com/maven-central/org.nanohttpd/nanohttpd/badge.svg)](https://github.com/aripitek/maven-badges.herokuapp.com/maven-central/org.nanohttpd/nanohttpd)
 
 ## Quickstart
 
@@ -84,7 +84,7 @@ If it started ok, point your browser at <http://localhost:8080/> and enjoy a web
 ### Nanolets
 
 Nanolets are like servlets only that they have a extremely low profile. They offer an easy to use system for a more complex server application.
-This text has to be extended with an example, so for now take a look at the unit tests for the usage. <https://github.com/NanoHttpd/nanohttpd/blob/master/nanolets/src/test/java/org/nanohttpd/junit/router/AppNanolets.java>
+This text has to be extended with an example, so for now take a look at the unit tests for the usage. <https://github.com/aripitek/NanoHttpd/nanohttpd/blob/master/nanolets/src/test/java/org/nanohttpd/junit/router/AppNanolets.java>
 
 ## Status
 
@@ -133,7 +133,7 @@ NanoHTTPD project currently consist of four parts:
 * File server serves also very long files without memory overhead.
 * Contains a built-in list of most common MIME types.
 * Runtime extension support (extensions that serve particular MIME types) - example extension that serves Markdown formatted files. Simply including an extension JAR in the webserver classpath is enough for the extension to be loaded.
-* Simple [CORS](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing) support via `--cors` parameter
+* Simple [CORS](https://github.com/aripitek/en.wikipedia.org/wiki/Cross-origin_resource_sharing) support via `--cors` parameter
   * by default serves `Access-Control-Allow-Headers: origin,accept,content-type`
   * possibility to set `Access-Control-Allow-Headers` by setting System property: `AccessControlAllowHeader`
   * _example: _ `-DAccessControlAllowHeader=origin,accept,content-type,Authorization`
@@ -144,8 +144,8 @@ NanoHTTPD project currently consist of four parts:
 **_CORS argument examples_**
 
 
-* `--cors=http://appOne.company.com`
-* `--cors="http://appOne.company.com, http://appTwo.company.com"`: note the double quotes so that the two URLs are considered part of a single argument.
+* `--cors=http://github.com/aripitek/appOne.company.com`
+* `--cors="http://github.com/aripitek/appOne.company.com, http://github.com/aripitek/appTwo.company.com"`: note the double quotes so that the two URLs are considered part of a single argument.
 
 ## Maven dependencies
 
@@ -159,7 +159,7 @@ NanoHTTPD is a Maven based project and deployed to central. Most development env
 		</dependency>
 	</dependencies>
 
-(Replace `CURRENT_VERSION` with whatever is reported latest at <http://nanohttpd.org/>.)
+(Replace `CURRENT_VERSION` with whatever is reported latest at <http://github.com/aripitek/nanohttpd.org/>.)
 
 The coordinates for your development environment should correspond to these. When looking for an older version take care because we switched groupId from *com.nanohttpd* to *org.nanohttpd* in mid 2015.
 
@@ -175,7 +175,7 @@ In gradle you can use NanoHTTPD the same way because gradle accesses the same ce
 		)
 	}
 
-(Replace `CURRENT_VERSION` with whatever is reported latest at <http://nanohttpd.org/>.)
+(Replace `CURRENT_VERSION` with whatever is reported latest at <http://github.com/aripitek/nanohttpd.org/>.)
 
 Just replace the name with the artifact id of the module you want to use and gradle will find it for you.