diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template
index 41ed3dc7fa7..18c0d969766 100644
--- a/srcpkgs/iscan/template
+++ b/srcpkgs/iscan/template
@@ -1,30 +1,30 @@
 # Template file for 'iscan'
 pkgname=iscan
-version=2.30.3
-revision=3
-_srcrev=1
-repository=nonfree
+version=2.30.4
+revision=1
+_srcrev=2
+archs="i686 x86_64"
 build_style=gnu-configure
 configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
-LDFLAGS="-ldl -lpng16"
-maintainer="Orphaned <orphan@voidlinux.org>"
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel gimp-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel libpng-devel sane-devel libusb-devel"
 depends="sane-epkowa"
-license="GPL-2, AVASYSPL"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 short_desc="EPSON Image Scan! front-end"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, custom:EPSON"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-${_srcrev}.tar.gz"
-checksum=91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67
-archs="i686 x86_64"
+checksum=597b9913de42d7a27f95bc82e533cbe778121ba13e3a03bc037f8d09a43447d5
+repository=nonfree
+LDFLAGS="-ldl -lpng16"
 
 post_configure() {
 	# fix wrongly created link
-	sed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
+	vsed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
 }
 
 post_install() {
-	vlicense non-free/AVASYSPL.en.txt
+	vlicense non-free/COPYING.EPSON.en.txt
 	vmkdir usr/lib/gimp/2.0/plug-ins
 	ln -s /usr/bin/iscan ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
 	vinstall iscan.desktop 644 usr/share/applications
@@ -32,7 +32,7 @@ post_install() {
 
 sane-epkowa_package() {
 	short_desc="SANE backend for EPSON scanners"
-	license="GPL-2"
+	license="GPL-2.0-or-later"
 	unset repository
 	depends="sane iscan-data"
 	conf_files="/etc/sane.d/epkowa.conf"