diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index efcf989..5a0f3f6 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -3,48 +3,61 @@
 # Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
 
 _gemname=rack
-pkgname=ruby-rack
-pkgver=3.0.4.1
+pkgname=ruby-${_gemname}
+pkgver=3.0.7
 pkgrel=1
 pkgdesc='Minimal, modular, and adaptable interface for developing web applications'
 url='https://rack.github.io/'
 arch=('any')
 license=('MIT')
 depends=('ruby')
-makedepends=('ruby-rdoc' 'ruby-rake' 'ruby-bundler' 'ruby-minitest'
-             'ruby-minitest-global_expectations' 'ruby-minitest-sprint')
+makedepends=('ruby-minitest-global_expectations' 'ruby-minitest-sprint')
 checkdepends=('ruby-webrick')
 options=('!emptydirs')
 source=(https://github.com/rack/rack/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('024c48083f6f7251431724a1cbe90822605f599c17018c5c13ee1d6edfc58029')
-sha512sums=('6cfb35d78901fdb5e7b4571eb6b37b035014cfea705aeff280a73930793e53cd6d2d9b51ae86803567884b5509af358c95687eecc222a5df61dc80d0ada019af')
+sha256sums=('ab76db725caaf08beff1a9d03022ad0ee67877a1f395cd5629f8c812124ef005')
+sha512sums=('7ed94b59a4c8886ad94898eb1a7dd3e363fd1b2cecb79713ab744853e7c3da7a1d10034235a1aa5da4cb50c1a5d7c86c4d524ba2a328bbbb6289e9f1f7e37edd')
 
 prepare() {
   cd ${_gemname}-${pkgver}
-  sed -r 's|~>|>=|g' -i ${_gemname}.gemspec Rakefile
+  sed -r 's|~>|>=|g' -i ${_gemname}.gemspec
 }
 
 build() {
   cd ${_gemname}-${pkgver}
-  rake build
+
+  local _gemdir="$(gem env gemdir)"
+
+  gem build ${_gemname}.gemspec
+
+  gem install \
+    --local \
+    --verbose \
+    --ignore-dependencies \
+    --no-user-install \
+    --install-dir "tmp_install/${_gemdir}" \
+    --bindir "tmp_install/usr/bin" \
+    "${_gemname}-${pkgver}.gem"
+
+  rm -rf "tmp_install/${_gemdir}/cache/"
 }
 
 check() {
   cd ${_gemname}-${pkgver}
-  rake test
+
+  local _gemdir="$(gem env gemdir)"
+
+  GEM_HOME="tmp_install/${_gemdir}" rake test
 }
 
 package() {
   cd ${_gemname}-${pkgver}
-  local _gemdir="$(gem env gemdir)"
-  gem install --ignore-dependencies --no-user-install -i "${pkgdir}${_gemdir}" \
-    -n "${pkgdir}/usr/bin" pkg/${_gemname}-${pkgver}.gem
-  install -Dm 644 README.md CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-  install -Dm 644 MIT-LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm 644 example/* -t "${pkgdir}/usr/share/doc/${pkgname}/example"
-
-  cd "${pkgdir}/${_gemdir}"
-  rm -r "${pkgdir}/${_gemdir}/cache"
+
+  cp -a tmp_install/* "${pkgdir}"
+
+  install -Dm 0644 README.md CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm 0644 MIT-LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 0644 example/* -t "${pkgdir}/usr/share/doc/${pkgname}/example"
 }
 
 # vim: ts=2 sw=2 et: