diff --git a/doc/CHANGES-2017 b/doc/CHANGES-2017
index 7bea218262d3..e15324039d9e 100644
--- a/doc/CHANGES-2017
+++ b/doc/CHANGES-2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.5340 2017/12/20 22:41:34 wiz Exp $
+$NetBSD: CHANGES-2017,v 1.5341 2017/12/21 03:47:24 manu Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -7708,3 +7708,4 @@ Changes to the packages collection and infrastructure in 2017:
 	Updated databases/pgbouncer to 1.8.1 [fhajny 2017-12-20]
 	Updated x11/modular-xorg-server to 1.19.6 [wiz 2017-12-20]
 	Updated x11/modular-xorg-xephyr to 1.19.6 [wiz 2017-12-20]
+	Added www/ap2-upload 0.7 [manu 2017-12-21]
diff --git a/www/Makefile b/www/Makefile
index a2ddba57a02c..5d71ce21e45f 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1288 2017/12/14 13:52:58 adam Exp $
+# $NetBSD: Makefile,v 1.1289 2017/12/21 03:47:24 manu Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -43,6 +43,7 @@ SUBDIR+=	ap2-python
 SUBDIR+=	ap2-subversion
 SUBDIR+=	ap2-suphp
 SUBDIR+=	ap2-transform
+SUBDIR+=	ap2-upload
 SUBDIR+=	ap2-xsendfile
 SUBDIR+=	ap22-authn-sasl
 SUBDIR+=	ap22-authnz-external
diff --git a/www/ap2-upload/DESCR b/www/ap2-upload/DESCR
new file mode 100644
index 000000000000..a4cf4130cb5d
--- /dev/null
+++ b/www/ap2-upload/DESCR
@@ -0,0 +1,3 @@
+Standalone upload manager for Apache. It can also replace
+PHP native upload implementation for performance benefit on
+network filesystems.
diff --git a/www/ap2-upload/Makefile b/www/ap2-upload/Makefile
new file mode 100644
index 000000000000..6084481165fd
--- /dev/null
+++ b/www/ap2-upload/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2017/12/21 03:47:25 manu Exp $
+
+DISTNAME=	mod_upload-0.7
+PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
+CATEGORIES=	www
+MASTER_SITES=	https://ftp.espci.fr/pub/mod_upload/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://ftp.espci.fr/pub/mod_upload/
+COMMENT=	High performance file upload helper for PHP
+LICENSE=	gnu-gpl-v2
+
+PKG_APACHE_ACCEPTED=    apache22 apache24
+
+APACHE_MODULE_NAME=     ${DISTNAME:C/-.*//}.la
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-apxs=${APXS}
+CONFIGURE_ARGS+=	--with-php-config=${BUILDLINK_PREFIX.php}/bin/php-config
+USE_LIBTOOL=		yes
+
+DOC_DIR=                share/doc/${DISTNAME:C/-.*//}
+INSTALLATION_DIRS+=     lib/httpd ${DOC_DIR}
+PLIST_SUBST+=           DOC_DIR=${DOC_DIR}
+
+do-build:
+	cd ${WRKSRC} && ${MAKE}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOC_DIR}
+
+.include "../../lang/php/phpversion.mk"
+.include "${PHPPKGSRCDIR}/buildlink3.mk"
+.include "../../mk/apache.module.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-upload/PLIST b/www/ap2-upload/PLIST
new file mode 100644
index 000000000000..58926157538b
--- /dev/null
+++ b/www/ap2-upload/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2017/12/21 03:47:25 manu Exp $
+lib/httpd/mod_upload.so
+${DOC_DIR}/README
diff --git a/www/ap2-upload/distinfo b/www/ap2-upload/distinfo
new file mode 100644
index 000000000000..d67a6f91d145
--- /dev/null
+++ b/www/ap2-upload/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2017/12/21 03:47:25 manu Exp $
+
+SHA1 (mod_upload-0.7.tar.gz) = f812cb2ff53597deb289f7f7739c883424d02d7e
+RMD160 (mod_upload-0.7.tar.gz) = ee3e5ff82b5f4e558ae255c8adc18ca7d4339dc9
+SHA512 (mod_upload-0.7.tar.gz) = cbf06237573360aa4fcc1cdb316b18a67826bfa6efc43ad35d3e5eca28fb360eac36e7e99dc9bea1db7f578fdbcf3e467c3947bca4707fb8925a87ff8c56a1a9
+Size (mod_upload-0.7.tar.gz) = 58324 bytes