diff --git a/README.md b/README.md
index 8d26b77..817f7f0 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Finally, if installing on a low-end ARM device (e.g. Raspberry Pi):
 
 To learn more about the philosophy and goals of the project, [visit **discourse.org**](http://www.discourse.org).
 
-**Shipped version:** 2.1.8
+**Shipped version:** 2.2.1
 
 ## Screenshots
 
diff --git a/check_process b/check_process
index 7909cb5..8b76740 100644
--- a/check_process
+++ b/check_process
@@ -12,7 +12,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1 from_commit=c97db21b4a821651355c48c4f7efdfb763e2a072
+		upgrade=1 from_commit=c8a29d271b87eac57e8dbf1a464c11a51d09810c
 		backup_restore=1
 # Activate multi-instance test only if you have more than 2Gb RAM!
 		multi_instance=1
@@ -36,6 +36,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=c97db21b4a821651355c48c4f7efdfb763e2a072
-		name=Upgrade to upstream version 2.0.2
+	; commit=c8a29d271b87eac57e8dbf1a464c11a51d09810c
+		name=Upgrade to upstream version 2.1.8
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&
diff --git a/conf/app.src b/conf/app.src
index ae4b78f..f16533e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://github.com/discourse/discourse/archive/v2.1.8.tar.gz
-SOURCE_SUM=f4c18a61f47d29381677e10d3ffaf68c407cc07eb5dae3b9a97245fab9f1d4b1
+SOURCE_URL=https://github.com/discourse/discourse/archive/v2.2.1.tar.gz
+SOURCE_SUM=d7fb8ea9facefa8a0488c89b478a544eb032c5ab36dba4b39c95f0d2462af25b
 SOURCE_FORMAT=tar.gz
diff --git a/manifest.json b/manifest.json
index 9ae374c..6f9939c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Discussion platform",
         "fr": "Plateforme de discussion"
     },
-    "version": "2.1.8~ynh1",
+    "version": "2.2.1~ynh1",
     "url": "http://Discourse.org",
     "license": "GPL-2.0",
     "maintainer": {
diff --git a/sources/patches/app-1-use-latest_uglify-js.patch b/sources/patches/app-1-use-latest_uglify-js.patch
index c8b9584..97d9375 100644
--- a/sources/patches/app-1-use-latest_uglify-js.patch
+++ b/sources/patches/app-1-use-latest_uglify-js.patch
@@ -1,12 +1,12 @@
 diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
-index bdca7c30ed..847a8d07c2 100644
+index 8575ca11dc..a643316bac 100644
 --- a/lib/tasks/assets.rake
 +++ b/lib/tasks/assets.rake
-@@ -95,6 +95,7 @@ def compress_ruby(from, to)
+@@ -94,6 +94,7 @@ def compress_ruby(from, to)
    data = File.read("#{assets_path}/#{from}")
 
    uglified, map = Uglifier.new(comments: :none,
 +                               harmony: true,
                                 source_map: {
                                   filename: File.basename(from),
-                                  output_filename: File.basename(to)
\ No newline at end of file
+                                  output_filename: File.basename(to)
diff --git a/sources/patches_arm/app-2-Revert-libv8-mini_racer-dependencies-for-ARM-compati.patch b/sources/patches_arm/app-2-Revert-libv8-mini_racer-dependencies-for-ARM-compati.patch
index a1f830f..7dc2ba8 100644
--- a/sources/patches_arm/app-2-Revert-libv8-mini_racer-dependencies-for-ARM-compati.patch
+++ b/sources/patches_arm/app-2-Revert-libv8-mini_racer-dependencies-for-ARM-compati.patch
@@ -1,9 +1,9 @@
 diff --git a/Gemfile.lock b/Gemfile.lock
-index 5752044b07..016f600bcc 100644
+index b59803ab6a..02b5d55b3d 100644
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
-@@ -171,7 +171,7 @@ GEM
-     jwt (1.5.6)
+@@ -172,7 +172,7 @@ GEM
+     jwt (2.1.0)
      kgio (2.11.2)
      kramdown (1.17.0)
 -    libv8 (6.7.288.46.1)
@@ -11,14 +11,14 @@ index 5752044b07..016f600bcc 100644
      listen (3.1.5)
        rb-fsevent (~> 0.9, >= 0.9.4)
        rb-inotify (~> 0.9, >= 0.9.7)
-@@ -198,8 +198,8 @@ GEM
+@@ -200,8 +200,8 @@ GEM
      method_source (0.8.2)
-     mini_mime (1.0.0)
+     mini_mime (1.0.1)
      mini_portile2 (2.3.0)
--    mini_racer (0.2.0)
+-    mini_racer (0.2.3)
 -      libv8 (>= 6.3)
 +    mini_racer (0.1.15)
 +      libv8 (~> 6.3)
-     mini_scheduler (0.8.1)
+     mini_scheduler (0.9.1)
+       sidekiq
      mini_sql (0.1.10)
-     mini_suffix (0.3.0)