diff --git a/community/opennebula/APKBUILD b/community/opennebula/APKBUILD
index f6adbbc075428f1bdea86ab0235693c21ed30538..0cc722b6bae147499d3d8daf8deaa60d0e41b53a 100644
--- a/community/opennebula/APKBUILD
+++ b/community/opennebula/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 # TODO: Add server components.
 pkgname=opennebula
-pkgver=5.12.12
+pkgver=6.4.0
 pkgrel=0
 pkgdesc="OpenNebula (currenty empty, install opennebula-tools instead)"
 url="https://opennebula.io"
@@ -10,22 +10,30 @@ arch="noarch !s390x"  # blocked by ruby-rbvmomi
 license="Apache-2.0"
 _depends_ruby="
 	ruby
+	ruby-ipaddress
 	ruby-nokogiri
+	ruby-parse-cron
 	ruby-rbvmomi
 	ruby-rexml
+	ruby-treetop
 	ruby-xmlrpc
 	"
 _depends_tools="
 	ruby
-	ruby-nokogiri
+	ruby-activesupport
+	ruby-opennebula=$pkgver-r$pkgrel
+	"
+makedepends="
+	$_depends_ruby
+	$_depends_tools
+	bash
 	"
-makedepends="$_depends_ruby $_depends_tools bash"
 # The subpackages reflect names of the official Debian/Ubuntu packages.
 subpackages="
 	ruby-$pkgname:rubylibs:noarch
 	$pkgname-tools::noarch
 	"
-source="https://github.com/OpenNebula/one/archive/release-$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://github.com/OpenNebula/one/archive/release-$pkgver/opennebula-$pkgver.tar.gz"
 builddir="$srcdir/one-release-$pkgver"
 options="!check"  # no tests provided
 
@@ -47,17 +55,16 @@ rubylibs() {
 
 tools() {
 	pkgdesc="Command Line interface for OpenNebula"
-	depends="$_depends_tools ruby-opennebula=$pkgver-r$pkgrel"
+	depends="$_depends_tools"
 
 	cd "$builddir"
 	_gem_install opennebula-cli
 
-	mkdir -p "$subpkgdir"/etc/one/cli
-	install -m 644 -t "$subpkgdir"/etc/one/cli src/cli/etc/*.yaml
+	install -D -m644 src/cli/etc/*.yaml -t "$subpkgdir"/etc/one/cli/
 }
 
 _gem_install() {
-	local gemname=$1
+	local gemname="$1"
 	local gemdir="$subpkgdir/$(ruby -e 'puts Gem.default_dir')"
 	local geminstdir="$gemdir/gems/$gemname-$pkgver"
 
@@ -70,12 +77,11 @@ _gem_install() {
 		--verbose \
 		./$gemname-$pkgver.gem
 
-	rm -rf "$gemdir"/cache \
-		"$gemdir"/doc \
-		"$geminstdir"/LICENSE \
-		"$geminstdir"/NOTICE
+	# Remove unnecessary files and rubbish...
+	(cd "$gemdir" && rm -r cache build_info doc extensions plugins)
+	(cd "$geminstdir" && rm -f LICENSE NOTICE)
 }
 
 sha512sums="
-7888c4acd994707ccaece464f9bd3d93dd668da73a1d0656b0440b7f46f53ea016555dca8f940d2d3afa88ac3361a0149f0a8529a6c9d0f04ad9baa029f5a9ae  opennebula-5.12.12.tar.gz
+df1466a360dfe6e2ae1e22fe952830166d4069a88bd6171cc1951a8d56d3eead5ac65cf7e43a6021e687fd0bd836df81a367a2670b50ea0ca554d543c903da82  opennebula-6.4.0.tar.gz
 "