diff --git a/gui-apps/openrefine/Manifest b/gui-apps/openrefine/Manifest
index d2224941b1..29e90aba1d 100644
--- a/gui-apps/openrefine/Manifest
+++ b/gui-apps/openrefine/Manifest
@@ -1 +1,2 @@
+DIST openrefine-commons-0.1.1.zip 2602139 BLAKE2B b9caba8d047a352ba47473012c9115dc348fd44aa33bac40ad95f2506fc43349a39f3699ec95ecdeb950f8ff0e23adad8bc3ec0aa8edade32cf8a9319516083d SHA512 d6ea62e6e9770317bfe217be0e96dabd8172f8956a32cf85da149220dfbe242494822378d885d01eb4814ee9cfc3e8dbe5fd6057630fff9692c22727ebbdf4bd
 DIST openrefine-linux-3.7.9.tar.gz 148721150 BLAKE2B c464b5038a754155a6e30c08a1c5fd626cc116706bc643e9802089fd87014ac2af0d03d0e3752004a2c0d27e5efa5e641ae8ec4ac546d0030f64e9ce82a75a22 SHA512 7786bef57d4b8341353e00ecfcf2dcbb6ce5161c4f65cab34e9555506711169f4020beed012e9388b3ff3c6ab666595acc1856d717dcaa3811a6765ded76ea59
diff --git a/gui-apps/openrefine/metadata.xml b/gui-apps/openrefine/metadata.xml
index d2eb4f51fe..67e2f214e3 100644
--- a/gui-apps/openrefine/metadata.xml
+++ b/gui-apps/openrefine/metadata.xml
@@ -5,6 +5,9 @@
 		<email>zdanevich.vitaly@ya.ru</email>
 		<name>Vitaly Zdanevich</name>
 	</maintainer>
+	<use>
+		<flag name="commons">Download and install plugin for Wikimedia Commons</flag>
+	</use>
 	<longdescription>
 OpenRefine is a powerful free, open source tool for working with messy data: cleaning it; transforming it from one format into another; and extending it with web services and external data.
 	</longdescription>
diff --git a/gui-apps/openrefine/openrefine-3.7.9.ebuild b/gui-apps/openrefine/openrefine-3.7.9.ebuild
index 127bc415da..48becdd8ac 100644
--- a/gui-apps/openrefine/openrefine-3.7.9.ebuild
+++ b/gui-apps/openrefine/openrefine-3.7.9.ebuild
@@ -8,16 +8,20 @@ inherit wrapper
 DESCRIPTION="Wikidata batch editor, Wikimedia Commons mass upload tool"
 HOMEPAGE="https://openrefine.org"
 
-SRC_URI="https://github.com/OpenRefine/OpenRefine/releases/download/${PV}/${PN}-linux-${PV}.tar.gz"
+SRC_URI="https://github.com/OpenRefine/OpenRefine/releases/download/${PV}/${PN}-linux-${PV}.tar.gz
+	commons? ( https://github.com/OpenRefine/CommonsExtension/releases/download/v0.1.1/openrefine-commons-0.1.1.zip )"
 KEYWORDS="~amd64"
+IUSE="+commons"
 
 LICENSE="BSD"
 SLOT="0"
 
+BDEPEND="commons? ( app-arch/unzip )"
+
 DEPEND="
-virtual/jre
-dev-java/maven-bin
-net-libs/nodejs
+	virtual/jre
+	dev-java/maven-bin
+	net-libs/nodejs
 "
 
 src_install() {
@@ -26,6 +30,11 @@ src_install() {
 	mkdir -p  "${ED}/${apphome}" tools build || die
 	chmod 775 tools build || die
 	keepdir ${apphome}/{tools,build}
+
+	if use commons ; then
+		cp -r "${WORKDIR}/${NANE}/commons-extension" webapp/extensions || die
+	fi
+
 	cp -r . "${ED}/${apphome}" || die
 
 	make_wrapper refine "