diff --git a/ruby-foreman/.SRCINFO b/ruby-foreman/.SRCINFO
index fbb6e39..f60541b 100644
--- a/ruby-foreman/.SRCINFO
+++ b/ruby-foreman/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = ruby-foreman
 	pkgdesc = Process manager for Procfile based applications
 	pkgver = 0.87.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://rubygems.org/gems/foreman
 	arch = any
 	license = MIT
 	depends = ruby
 	noextract = foreman-0.87.2.gem
+	options = !emptydirs
 	source = https://rubygems.org/downloads/foreman-0.87.2.gem
+	source = ruby-foreman-0.87.2-LICENSE::https://raw.githubusercontent.com/ddollar/foreman/v0.87.2/LICENSE
 	sha256sums = 2727bc6e2100bf80b76e391aefe8c30a9d172b4a8acf56f072f94ffeedeeef6b
+	sha256sums = 2ea6256739b0f021fc38053d3c9ce7103a404033b946c0d7f660b34097044d2e
 
 pkgname = ruby-foreman
-
diff --git a/ruby-foreman/PKGBUILD b/ruby-foreman/PKGBUILD
index 3ebbedd..f15ff61 100644
--- a/ruby-foreman/PKGBUILD
+++ b/ruby-foreman/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Michal Wojdyla < micwoj9292 at gmail dot com >
-# Maintainer: Charlie Wolf <charlie@wolf.is>
+# Maintainer: Bert Peters <bert@bertptrs.nl>
+# Contributor: Michal Wojdyla < micwoj9292 at gmail dot com >
+# Contributor: Charlie Wolf <charlie@wolf.is>
 
 _gemname=foreman
 pkgname=ruby-${_gemname}
 pkgver=0.87.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Process manager for Procfile based applications"
 arch=('any')
 depends=('ruby')
@@ -13,13 +14,21 @@ noextract=($_gemname-$pkgver.gem)
 license=('MIT')
 source=(
 	"https://rubygems.org/downloads/${_gemname}-${pkgver}.gem"
+	"$pkgname-$pkgver-LICENSE::https://raw.githubusercontent.com/ddollar/$_gemname/v$pkgver/LICENSE"
 )
-sha256sums=(
-	'2727bc6e2100bf80b76e391aefe8c30a9d172b4a8acf56f072f94ffeedeeef6b'
-)
+options=(!emptydirs)
+sha256sums=('2727bc6e2100bf80b76e391aefe8c30a9d172b4a8acf56f072f94ffeedeeef6b'
+            '2ea6256739b0f021fc38053d3c9ce7103a404033b946c0d7f660b34097044d2e')
 
 package() {
 	local _gemdir="$(ruby -e'puts Gem.default_dir')"
 	gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $_gemname-$pkgver.gem
 	rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem"
+
+    # Manually install the license because the gem contains none
+    install -Dm644 "$srcdir/$pkgname-$pkgver-LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+    # Move the man page into proper position
+    mkdir -p "$pkgdir/usr/share/man/man1"
+    mv "$pkgdir/$_gemdir/gems/$_gemname-$pkgver/man/foreman.1" "$pkgdir/usr/share/man/man1"
 }