diff --git a/roundcubemail-git/.SRCINFO b/roundcubemail-git/.SRCINFO
index e535845..d8df70f 100644
--- a/roundcubemail-git/.SRCINFO
+++ b/roundcubemail-git/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = roundcubemail-git
 	pkgdesc = A PHP web-based mail client
-	pkgver = 1.4.rc2.r702.ga0fbcf381
+	pkgver = 1.5rc.r16.g2f643141b
 	pkgrel = 1
 	url = https://roundcube.net/
 	arch = any
@@ -26,4 +26,3 @@ pkgbase = roundcubemail-git
 	sha256sums = c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0
 
 pkgname = roundcubemail-git
-
diff --git a/roundcubemail-git/PKGBUILD b/roundcubemail-git/PKGBUILD
index 086ce5b..623af1c 100644
--- a/roundcubemail-git/PKGBUILD
+++ b/roundcubemail-git/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=roundcubemail-git
-pkgver=1.4.rc2.r702.ga0fbcf381
+pkgver=1.5rc.r16.g2f643141b
 pkgrel=1
 pkgdesc="A PHP web-based mail client"
 arch=('any')
@@ -21,7 +21,7 @@ sha256sums=('SKIP'
 
 pkgver() {
   cd "roundcubemail"
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags | sed 's/-\(alpha\|beta\|rc\)/\1/g;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -40,7 +40,7 @@ prepare() {
 
 build(){
   cd "$srcdir"/roundcubemail
-  php -d extension=gd.so /usr/bin/composer install --no-dev --ignore-platform-req=ext-gd
+  php -d extension=gd.so /usr/bin/composer install --no-dev --ignore-platform-req=ext-gd --ignore-platform-req=ext-iconv
   bin/install-jsdeps.sh
   bin/jsshrink.sh