diff --git a/README.md b/README.md
index ab97f22..46b5eec 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,13 @@
 
 
 [Friendica](http://friendi.ca/) integration for YunoHost<br>
-<strong>Version:</strong>3.5.4<br><br>
+<strong>Version:</strong>3.6<br><br>
+<strong>If you are updating from a very old version of Friendica, you have to first update to version 3.5.4(from here https://github.com/YunoHost-Apps/friendica_ynh/tree/58774643d2d8918e9eff0ba1c1ba38d2beea79ca) before you can update to the 3.6 release.</strong> 
 
 Current snapshot in *sources*:
 
-* https://github.com/friendica/friendica: 3.5.4 (commit f4632319c0554fdca10aafd0e53d5306f0538db1)
-* https://github.com/friendica/friendica-addons: 3.5.4 (commit 6a809a926c1818232c3ebafbffe5b4fd54eae805)
+* https://github.com/friendica/friendica: 3.6 (commit bacc5de3a229ab069db527854adbe6f1e593cd5a)
+* https://github.com/friendica/friendica-addons: 3.6 (commit dbe8118e406510d85404d9577f83d68782cfe2a0)
 
 ## Important Notes
 
diff --git a/conf/addons.src b/conf/addons.src
index bfb8815..8813618 100644
--- a/conf/addons.src
+++ b/conf/addons.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/friendica/friendica-addons/archive/3.5.4.zip
-SOURCE_SUM=9db6a34830b1c2e89418bf159b5a866f
+SOURCE_URL=https://github.com/friendica/friendica-addons/archive/3.6.zip
+SOURCE_SUM=b94e1d9404d27351c029e055a4bbaf96
 SOURCE_SUM_PRG=md5sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/app.src b/conf/app.src
index d51e045..b146fc1 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/friendica/friendica/archive/3.5.4.zip
-SOURCE_SUM=a6993a4d13ffee886b1beac9602df35e
+SOURCE_URL=https://github.com/friendica/friendica/releases/download/3.6/friendica-full-3.6.zip
+SOURCE_SUM=13b6fa36e458f43c4eafc279141d490d
 SOURCE_SUM_PRG=md5sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/poller-cron b/conf/poller-cron
index fbbbcda..7a9bcaa 100644
--- a/conf/poller-cron
+++ b/conf/poller-cron
@@ -1,2 +1,2 @@
 # Run poller periodically to update Hubzilla
-*/10 * * * * cd YNH_WWW_PATH; /usr/bin/php include/poller.php
+*/10 * * * * cd YNH_WWW_PATH; /usr/bin/php scripts/poller.php