diff --git a/www/mediawiki136/Makefile b/www/mediawiki136/Makefile
new file mode 100644
index 000000000000..b9ced492e15a
--- /dev/null
+++ b/www/mediawiki136/Makefile
@@ -0,0 +1,67 @@
+# Created by: Gerrit Beine <tux@pinguru.net>
+
+PORTNAME=	mediawiki
+PORTVERSION=	1.36.1
+CATEGORIES=	www
+MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
+PKGNAMESUFFIX=	136${PHP_PKGNAMESUFFIX}
+
+MAINTAINER=	wen@FreeBSD.org
+COMMENT=	Wiki engine used by Wikipedia
+
+LICENSE=	GPLv2
+
+CONFLICTS=	mediawiki13[1-5]-[0-9]*
+
+USES=		php:flavors shebangfix
+SHEBANG_FILES=	maintenance/dev/*.sh \
+		maintenance/storage/make-blobs
+SHEBANG_LANG=	hhvm
+hhvm_OLD_CMD=	/usr/bin/hhvm
+hhvm_CMD=	${LOCALBASE}/bin/hhvm # not installed by anything yet
+USE_PHP=	ctype dom fileinfo filter hash iconv intl json mbstring openssl \
+		pcre readline session xml xmlreader zlib
+MEDIAWIKIDIR?=	www/mediawiki
+
+NO_BUILD=	yes
+PLIST=		${WRKDIR}/plist
+
+SUB_FILES=	pkg-message
+SUB_LIST=	MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR}
+
+OPTIONS_DEFINE=	LDAP MEMCACHED IMAGICK SOCKETS
+OPTIONS_SINGLE=	DB
+OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=	MYSQL SOCKETS
+
+MEMCACHED_DESC=	Use memcached
+IMAGICK_DESC=	Use ImageMagick
+SOCKETS_DESC=	Use sockets
+
+MYSQL_USES=	mysql
+MYSQL_USE=	php=mysqli
+PGSQL_USE=	php=pgsql
+SQLITE_USE=	php=sqlite3
+LDAP_USE=	php=ldap
+SOCKETS_USE=	php=sockets
+
+MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
+
+pre-install:
+	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
+	@${ECHO} "@dir %%WWWDIR%%/cache" >> ${PLIST}
+	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
+	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
+	@${ECHO} "@mode 0755" >> ${PLIST}
+	@${ECHO} "@dir %%WWWDIR%%/images" >> ${PLIST}
+	@${ECHO} "@mode" >> ${PLIST}
+	@${ECHO_CMD} "@owner" >> ${PLIST}
+	@${ECHO_CMD} "@group" >> ${PLIST}
+	@${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST}
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
+
+.include <bsd.port.mk>
diff --git a/www/mediawiki136/distinfo b/www/mediawiki136/distinfo
new file mode 100644
index 000000000000..ecdcea817b49
--- /dev/null
+++ b/www/mediawiki136/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1625959959
+SHA256 (mediawiki-1.36.1.tar.gz) = e6698b19af16274e5ec2bfd36b890996cfa9f3617d2ec81761f12854fa50ad7a
+SIZE (mediawiki-1.36.1.tar.gz) = 49645517
diff --git a/www/mediawiki136/files/pkg-message.in b/www/mediawiki136/files/pkg-message.in
new file mode 100644
index 000000000000..b05e89945b5f
--- /dev/null
+++ b/www/mediawiki136/files/pkg-message.in
@@ -0,0 +1,15 @@
+[
+{ type: install
+  message: <<EOM
+Remember to check
+
+%%MEDIAWIKIDIR%%/INSTALL
+
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
+for details
+EOM
+}
+]
diff --git a/www/mediawiki136/pkg-descr b/www/mediawiki136/pkg-descr
new file mode 100644
index 000000000000..dac83f83ccda
--- /dev/null
+++ b/www/mediawiki136/pkg-descr
@@ -0,0 +1,6 @@
+MediaWiki is the collaborative editing software that runs Wikipedia,
+the free encyclopedia, and other projects.
+It's designed to handle a large number of users and pages without imposing
+too rigid a structure or workflow.
+
+WWW: http://www.mediawiki.org/