diff --git a/.SRCINFO b/.SRCINFO
index b60abe5..396426f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,17 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 3.8.6
-	pkgrel = 4
+	pkgver = 4.0.0
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
 	depends = ruby>=2.1.0
 	depends = ruby-addressable>=2.4
-	depends = ruby-addressable<3.0
 	depends = ruby-colorator>=1.0
-	depends = ruby-colorator<=2.0
-	depends = ruby-jekyll-sass-converter-1>=1.0
-	depends = ruby-jekyll-sass-converter-1<2.0
+	depends = ruby-jekyll-sass-converter>=2.0
+	depends = ruby-sassc
 	depends = ruby-jekyll-watch>=2.0
-	depends = ruby-jekyll-watch<3.0
-	depends = ruby-kramdown-1>=1.14
-	depends = ruby-kramdown-1<2.0
+	depends = ruby-kramdown>=2.1.0
 	depends = ruby-liquid>=4.0
 	depends = ruby-liquid<5.0
 	depends = ruby-mercenary>=0.3.3
@@ -26,21 +22,23 @@ pkgbase = jekyll
 	depends = ruby-rouge<4.0
 	depends = ruby-safe_yaml>=1.0
 	depends = ruby-safe_yaml<2.0
-	depends = ruby-i18n>=0.7
-	depends = ruby-i18n<1.0
+	depends = ruby-i18n>=1
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-em-websocket<1.0
+	depends = ruby-kramdown-parser-gfm
+	depends = ruby-terminal-table
+	optdepends = ruby-minima: Default theme for Jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.8.6
+	provides = jekyll=4.0.0
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-3.8.6.gem
+	noextract = jekyll-4.0.0.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-3.8.6.gem
-	sha512sums = 9b54f3c06373ff515c3f190645a231538b3045a5d39b568defc4977434a52812a1cfa1f9ec836b0b7376d1d0290ca17a55b69b3039203aa8f99df8e9b66c56e3
+	source = https://rubygems.org/downloads/jekyll-4.0.0.gem
+	sha256sums = 4a1dc48895d525bfb98cd562bf03ab6dd2727b5795360877c90e12670b9fec3a
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c3ae3f..5b042e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,36 @@
 # Maintainer: Shengyu Zhang <la@archlinuxcn.org>
 # Co-Maintainer: Bjoern Franke <bjo+aur@schafweide.org>
+# Co-Maintainer: Bert Peters <bert+aur@bertptrs.nl>
 # Contributor: Carsten Feuls <archlinux@carstenfeuls.de>
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=3.8.6
-pkgrel=4
+pkgver=4.0.0
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
 license=('MIT')
 depends=('ruby>=2.1.0'
-    'ruby-addressable>=2.4' 'ruby-addressable<3.0'
-    'ruby-colorator>=1.0' 'ruby-colorator<=2.0'
-    'ruby-jekyll-sass-converter-1>=1.0' 'ruby-jekyll-sass-converter-1<2.0'
-    'ruby-jekyll-watch>=2.0' 'ruby-jekyll-watch<3.0'
-    'ruby-kramdown-1>=1.14' 'ruby-kramdown-1<2.0'
+    'ruby-addressable>=2.4'
+    'ruby-colorator>=1.0'
+    'ruby-jekyll-sass-converter>=2.0'
+    'ruby-sassc' # actually a missing dependency of ruby-jekyll-sass-converter
+    'ruby-jekyll-watch>=2.0'
+    'ruby-kramdown>=2.1.0'
     'ruby-liquid>=4.0' 'ruby-liquid<5.0'
     'ruby-mercenary>=0.3.3' 'ruby-mercenary<0.4'
     'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
     'ruby-rouge>1.7' 'ruby-rouge<4.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
-    'ruby-i18n>=0.7' 'ruby-i18n<1.0'
+    'ruby-i18n>=1'
     'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
+    'ruby-kramdown-parser-gfm'
+    'ruby-terminal-table'
     )
-optdepends=('ruby-jekyll-paginate'
+optdepends=(
+    'ruby-minima: Default theme for Jekyll'
+    'ruby-jekyll-paginate'
     'ruby-jekyll-gist'
     'ruby-jekyll-feed'
     )
@@ -34,7 +40,7 @@ replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-sha512sums=('9b54f3c06373ff515c3f190645a231538b3045a5d39b568defc4977434a52812a1cfa1f9ec836b0b7376d1d0290ca17a55b69b3039203aa8f99df8e9b66c56e3')
+sha256sums=('4a1dc48895d525bfb98cd562bf03ab6dd2727b5795360877c90e12670b9fec3a')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"