diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 1b199d06b..c52d6322d 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Bruno Pagani <archange@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
@@ -6,31 +7,31 @@
 #  - patch and rebuild rebar on AArch64
 
 pkgname=couchdb
-pkgver=2.1.0
+pkgver=2.1.1
 pkgrel=1
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://couchdb.apache.org"
 license=('APACHE')
 depends=('icu' 'js185' 'openssl' 'zlib')
-makedepends=('erlang19-nox')
+makedepends=('erlang-nox')
 install=${pkgname}.install
 backup=('etc/couchdb/local.ini'
         'etc/couchdb/vm.args')
-validpgpkeys=('29E4F38113DF707D722A6EF91FE9AF73118F1A7C')
-source=("http://www-eu.apache.org/dist/couchdb/source/${pkgver}/apache-couchdb-${pkgver}.tar.gz"{,.asc}
+source=("https://www-eu.apache.org/dist/couchdb/source/${pkgver}/apache-couchdb-${pkgver}.tar.gz"{,.asc}
         "https://github.com/rebar/rebar/commit/f9b850c428dae6cf6673ff076d863d5b6c343569.patch"
         'couchdb.service'
         'couchdb.sysusers'
         'couchdb.tmpfiles'
         'datadirs.ini')
-sha256sums=('eb1fbf746cd4bce2322389983e4d174c78e1520435578bff1507bb51c96a8825'
+sha256sums=('d5f255abc871ac44f30517e68c7b30d1503ec0f6453267d641e00452c04e7bcc'
             'SKIP'
             'f9465e279b40adde6db8008c4c0366a700a04602bfa7f189c9ad6eac13754efa'
             'b658af33dcd5e7f90b42ba1b65b61905b818103f0a9fa85f15f3bfec216c7435'
             '3ed1ad2a37a068ce194b03fb72eb35285d60fa7faf2d2c2bb710703d229108a8'
             '0ce806cbc5e18e60b17be9fd2cdbd4c7f12cc84ca95b079efdede16ddb5f3efd'
             '937ca3498aab47b3f2226d027fa8a1a95de55cbb463373099e28cb9a6c7046ac')
+validpgpkeys=('2EC788AE3F239FA13E82D215CDE711289384AE37') # Joan Touzet (CODE SIGNING KEY) <wohali@apache.org>
 
 prepare() {
   cd apache-couchdb-${pkgver}
diff --git a/community/couchdb/couchdb.install b/community/couchdb/couchdb.install
index 1b505da6f..630a90da3 100644
--- a/community/couchdb/couchdb.install
+++ b/community/couchdb/couchdb.install
@@ -1,9 +1,10 @@
 post_upgrade() {
-    if [ $(vercmp $2 2.0.0-15) -lt 0 ] ; then
+    if [ $(vercmp $2 2.1.1-1) -lt 0 ] ; then
         cat << EOF
 
-Since 2.0.0-15, couchdb user now defaults to couchdb group (it used to be in the daemon group).
-You might want to change couchdb user to this new group and fix ownership of its files.
+Be sure to read http://docs.couchdb.org/en/2.1.1/whatsnew/2.1.html#upgrade-notes.
+Note that your /etc/couchdb/vm.args has been replaced by the new one if you
+never edited it, so you might actually have to change it as advised.
 
 EOF
     fi