diff --git a/dev-python/flask-sqlalchemy/files/mapping.patch b/dev-python/flask-sqlalchemy/files/mapping.patch
index 32bee9c4f148e..af6572489a4fd 100644
--- a/dev-python/flask-sqlalchemy/files/mapping.patch
+++ b/dev-python/flask-sqlalchemy/files/mapping.patch
@@ -1,6 +1,6 @@
 diff -ur Flask-SQLAlchemy-1.0.orig/docs/conf.py Flask-SQLAlchemy-1.0/docs/conf.py
---- docs/conf.py	2013-01-27 08:57:36.000000000 +0800
-+++ docs/conf.py	2014-04-03 18:08:34.772268079 +0800
+--- a/docs/conf.py	2013-01-27 08:57:36.000000000 +0800
++++ b/docs/conf.py	2014-04-03 18:08:34.772268079 +0800
 @@ -224,9 +224,9 @@
  
  
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
index 0b58296ca5e7d..7a4cff5c2c77a 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-sqlalchemy/metadata.xml
index 74a0a807e782c..53187fdda8627 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-sqlalchemy/metadata.xml
@@ -10,5 +10,11 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
+		<remote-id type="github">mitsuhiko/flask-sqlalchemy</remote-id>
+		<bugs-to>https://github.com/mitsuhiko/flask-sqlalchemy/issues</bugs-to>
 	</upstream>
+	<longdescription lang="en">
+		Flask-SQLAlchemy is a Flask microframework extension which adds
+		support for the SQLAlchemy SQL toolkit/ORM.
+	</longdescription>
 </pkgmetadata>