diff --git a/roundcubemail-git/.SRCINFO b/roundcubemail-git/.SRCINFO
new file mode 100644
index 0000000..e1969d4
--- /dev/null
+++ b/roundcubemail-git/.SRCINFO
@@ -0,0 +1,23 @@
+pkgbase = roundcubemail-git
+	pkgdesc = A PHP web-based mail client
+	pkgver = 1.4.beta.r117.g224dd78ad
+	pkgrel = 1
+	url = https://roundcube.net/
+	arch = any
+	license = GPL
+	makedepends = php-composer
+	makedepends = git
+	depends = php
+	depends = php-gd
+	optdepends = python2
+	provides = roundcubemail
+	conflicts = roundcubemail
+	backup = etc/webapps/roundcubemail/.htaccess
+	backup = etc/webapps/roundcubemail/apache.conf
+	source = git+https://github.com/roundcube/roundcubemail.git
+	source = apache.conf
+	sha256sums = SKIP
+	sha256sums = c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0
+
+pkgname = roundcubemail-git
+
diff --git a/roundcubemail-git/PKGBUILD b/roundcubemail-git/PKGBUILD
new file mode 100644
index 0000000..e468653
--- /dev/null
+++ b/roundcubemail-git/PKGBUILD
@@ -0,0 +1,87 @@
+# Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=roundcubemail-git
+pkgver=1.4.beta.r117.g224dd78ad
+pkgrel=1
+pkgdesc="A PHP web-based mail client"
+arch=('any')
+url="https://roundcube.net/"
+license=('GPL')
+depends=('php' 'php-gd')
+makedepends=('php-composer' 'git')
+optdepends=('python2')
+provides=('roundcubemail')
+conflicts=('roundcubemail')
+backup=('etc/webapps/roundcubemail/.htaccess'
+        'etc/webapps/roundcubemail/apache.conf')
+source=("git+https://github.com/roundcube/roundcubemail.git"
+        "apache.conf")
+sha256sums=('SKIP'
+            'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0')
+
+pkgver() {
+  cd "roundcubemail"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd "$srcdir"/roundcubemail
+  sed -i \
+    -e "s|RCUBE_INSTALL_PATH . 'temp.*|'/var/cache/roundcubemail';|" \
+    -e "s|RCUBE_INSTALL_PATH . 'logs.*|'/var/log/roundcubemail';|" \
+    config/defaults.inc.php \
+    program/lib/Roundcube/rcube_config.php
+
+  sed -i 's!"dest": "program/js/tinymce"!"dest": "program/js/tinymce/langs"!' jsdeps.json
+
+  mv composer.json-dist composer.json
+  php -d extension=gd.so /usr/bin/composer install --no-dev
+  bin/install-jsdeps.sh
+  bin/jsshrink.sh
+
+  cd skins/elastic
+  lessc -x styles/styles.less > styles/styles.css
+  lessc -x styles/print.less > styles/print.css
+  lessc -x styles/embed.less > styles/embed.css
+  cd ../..
+
+  bin/updatecss.sh
+  bin/cssshrink.sh
+  #rm transifexpull.sh package2composer.sh importgettext.sh exportgettext.sh README.md INSTALL UPGRADING, LICENSE, CHANGELOG
+  rm -rf tests/ public_html/ installer/ .tx*
+
+}
+
+
+package() {
+  mkdir -p "$pkgdir"/etc/webapps/roundcubemail
+  mkdir -p "$pkgdir"/usr/share/webapps
+  cd "$pkgdir"/usr/share/webapps
+  cp -ra "$srcdir"/roundcubemail roundcubemail
+  cd roundcubemail
+
+  mv .htaccess "$pkgdir"/etc/webapps/roundcubemail/
+  ln -s /etc/webapps/roundcubemail/.htaccess .htaccess
+
+  mv config "$pkgdir"/etc/webapps/roundcubemail/
+  ln -s /etc/webapps/roundcubemail/config config
+
+  install -Dm0644 "$srcdir"/apache.conf "$pkgdir"/etc/webapps/roundcubemail/apache.conf
+  chown http:http "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
+  chmod 0640 "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
+
+  install -dm0750 -o http -g http "$pkgdir"/var/cache/roundcubemail
+  install -dm0750 -o http -g http "$pkgdir"/var/log/roundcubemail
+
+  rm -rf temp logs
+  find "$pkgdir" -name .git -exec rm -rf {} \; || true
+
+#  sed -i "s|"$srcdir"/roundcubemail/vendor/pear-pear.php.net/Console_CommandLine/data|/usr/share/webapps/roundcubemail/vendor/pear-pear.php.net|g" \
+#    vendor/pear-pear.php.net/Console_CommandLine/Console/CommandLine/XmlParser.php
+
+#  sed -i "s|"$srcdir"/roundcubemail|/usr/share/webapps/roundcubemail|g" \
+#    vendor/pear-pear.php.net/Crypt_GPG/bin/crypt-gpg-pinentry \
+#    vendor/pear-pear.php.net/Crypt_GPG/Crypt/GPG/Engine.php \
+#    vendor/pear-pear.php.net/Crypt_GPG/Crypt/GPG/PinEntry.php
+}
diff --git a/roundcubemail-git/apache.conf b/roundcubemail-git/apache.conf
new file mode 100644
index 0000000..e7e2b35
--- /dev/null
+++ b/roundcubemail-git/apache.conf
@@ -0,0 +1,7 @@
+Alias /roundcube "/usr/share/webapps/roundcubemail"
+<Directory "/usr/share/webapps/roundcubemail">
+    AllowOverride All
+    Options FollowSymlinks
+    Require all granted
+    php_admin_value open_basedir "/tmp/:/var/cache/roundcubemail:/usr/share/webapps/roundcubemail:/etc/webapps/roundcubemail:/usr/share/pear/:/var/log/roundcubemail"
+</Directory>
diff --git a/roundcubemail-git/roundcubemail.tmpfiles b/roundcubemail-git/roundcubemail.tmpfiles
new file mode 100644
index 0000000..17b6367
--- /dev/null
+++ b/roundcubemail-git/roundcubemail.tmpfiles
@@ -0,0 +1,2 @@
+d /var/cache/roundcubemail 0750 http http - -
+d /var/log/roundcubemail 0750 http http - -