diff --git a/Dockerfile b/Dockerfile
index f2e7ef6..3581d3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN \
 
 RUN \
   cd /root && \
-  wget https://github.com/fguillot/miniflux/archive/master.zip -O miniflux.zip && \
+  wget https://github.com/miniflux/miniflux/archive/master.zip -O miniflux.zip && \
   unzip miniflux.zip -d /var/www && \
   mv /var/www/miniflux-master/* /var/www/ && \
   rm miniflux.zip && \
diff --git a/README.markdown b/README.markdown
index 422e850..741a0dc 100644
--- a/README.markdown
+++ b/README.markdown
@@ -85,7 +85,7 @@ External projects build around Miniflux:
 Todo and known bugs
 -------------------
 
-- See Issues: <https://github.com/fguillot/miniflux/issues>
+- See Issues: <https://github.com/miniflux/miniflux/issues>
 
 License
 -------
diff --git a/docs/faq.markdown b/docs/faq.markdown
index f266e1f..b1fe61a 100644
--- a/docs/faq.markdown
+++ b/docs/faq.markdown
@@ -22,7 +22,7 @@ Sorry, I don't plan to have categories or tags.
 I found a bug, what next?
 -------------------------
 
-Report the bug to the [issues tracker](https://github.com/fguillot/miniflux/issues) and I will fix it.
+Report the bug to the [issues tracker](https://github.com/miniflux/miniflux/issues) and I will fix it.
 
 You can report feeds that doesn't works properly too.
 
diff --git a/docs/full-article-download.markdown b/docs/full-article-download.markdown
index 6f340a7..e3bc3a9 100644
--- a/docs/full-article-download.markdown
+++ b/docs/full-article-download.markdown
@@ -55,6 +55,6 @@ Don't forget to send a pull request or a ticket to share your contribution with
 List of content grabber rules
 -----------------------------
 
-[List of existing rules on the repository](https://github.com/fguillot/miniflux/tree/master/vendor/fguillot/picofeed/lib/PicoFeed/Rules)
+[List of existing rules on the repository](https://github.com/miniflux/miniflux/tree/master/vendor/fguillot/picofeed/lib/PicoFeed/Rules)
 
 If you want to add new rules, just open a ticket and I will do it.
diff --git a/docs/installation.markdown b/docs/installation.markdown
index c69ef1b..0d5618e 100644
--- a/docs/installation.markdown
+++ b/docs/installation.markdown
@@ -16,7 +16,7 @@ Installation
 
 ### From the repository (development version)
 
-1. `git clone https://github.com/fguillot/miniflux.git`
+1. `git clone https://github.com/miniflux/miniflux.git`
 2. Go to the third step just above
 
 Security
diff --git a/models/schema.php b/models/schema.php
index bd0957b..7375c06 100644
--- a/models/schema.php
+++ b/models/schema.php
@@ -5,7 +5,12 @@ namespace Schema;
 use PDO;
 use Model\Config;
 
-const VERSION = 39;
+const VERSION = 40;
+
+function version_40($pdo)
+{
+    $pdo->exec('UPDATE settings SET "value"="https://github.com/miniflux/miniflux/archive/master.zip" WHERE "key"="auto_update_url"');
+}
 
 function version_39($pdo)
 {