diff --git a/www/Makefile b/www/Makefile
index 49659ab4256d..7c5a8bc939b7 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -428,6 +428,7 @@
     SUBDIR += mawstats
     SUBDIR += mediawiki
     SUBDIR += mediawiki118
+    SUBDIR += mediawiki120
     SUBDIR += mergelog
     SUBDIR += metacafe_dl
     SUBDIR += mgstat
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index c4cbff5d9b32..7707797ec292 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -12,7 +12,7 @@ COMMENT=	The wiki engine used by Wikipedia
 
 LICENSE=	GPLv2
 
-CONFLICTS=	mediawiki-1.1[0-8].*
+CONFLICTS=	mediawiki-1.1[0-8].* mediawiki-1.2[0-9].*
 
 FETCH_ARGS=	-pr
 USE_PHP=	ctype iconv mbstring pcre session xml zlib readline dom
diff --git a/www/mediawiki118/Makefile b/www/mediawiki118/Makefile
index 50dd32bbcfb8..aa1cbadfb61d 100644
--- a/www/mediawiki118/Makefile
+++ b/www/mediawiki118/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://dumps.wikimedia.org/mediawiki/${PORTVERSION:R}/
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.19.*
+CONFLICTS=	mediawiki-1.19.* mediawiki-1.2[0-9].*
 
 FETCH_ARGS=	-pr
 NO_LATEST_LINK=	yes
diff --git a/www/mediawiki120/Makefile b/www/mediawiki120/Makefile
new file mode 100644
index 000000000000..27517180dfcf
--- /dev/null
+++ b/www/mediawiki120/Makefile
@@ -0,0 +1,80 @@
+# Created by: Gerrit Beine <tux@pinguru.net>
+# $FreeBSD$
+
+PORTNAME=	mediawiki
+PORTVERSION=	1.20.2
+CATEGORIES=	www
+MASTER_SITES=	http://dumps.wikimedia.org/mediawiki/${PORTVERSION:R}/
+
+MAINTAINER=	wen@FreeBSD.org
+COMMENT=	The wiki engine used by Wikipedia
+
+LICENSE=	GPLv2
+
+CONFLICTS=	mediawiki-1.1[0-9].*
+
+FETCH_ARGS=	-pr
+USE_PHP=	ctype iconv mbstring pcre session xml zlib readline dom
+IGNORE_WITH_PHP=4
+WANT_PHP_WEB=	yes
+MEDIAWIKIDIR?=	www/mediawiki
+
+NO_BUILD=	yes
+
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL XCACHE IMAGICK
+OPTIONS_DEFAULT=MYSQL APC
+
+MEMCACHED_DESC=	use memcached
+APC_DESC=	use pecl-APC(Mediawiki recommended)
+EACCEL_DESC=	use eAccelerator (instead of pecl-APC)
+XCACHE_DESC=	use xCache (instead of pecl-APC)
+IMAGICK_DESC=	use ImageMagick
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
+USE_MYSQL=	server
+USE_PHP+=	mysql
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PHP+=	pgsql
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
+USE_PHP+=	sqlite
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+USE_PHP+=	ldap
+.endif
+
+.if ${PORT_OPTIONS:MMEMCACHED}
+RUN_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
+.endif
+
+.if ${PORT_OPTIONS:MIMAGICK}
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
+.endif
+
+.if ${PORT_OPTIONS:MAPC}
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
+.elif ${PORT_OPTIONS:MEACCEL}
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/eaccelerator.so:${PORTSDIR}/www/eaccelerator
+.elif ${PORT_OPTIONS:MXCACHE}
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
+.endif
+
+do-install:
+	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
+	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MEDIAWIKIDIR}
+
+post-install:
+	@${FIND} ${WRKSRC}/${file} -not -type d \
+		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${FIND} -d ${WRKSRC}/${file} -type d \
+		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
+	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/www/mediawiki120/distinfo b/www/mediawiki120/distinfo
new file mode 100644
index 000000000000..09784c2e4473
--- /dev/null
+++ b/www/mediawiki120/distinfo
@@ -0,0 +1,2 @@
+SHA256 (mediawiki-1.20.2.tar.gz) = ac29b11a297f556765210e65d5d5ad6b0f55055e345d2f3deba0f29853507a31
+SIZE (mediawiki-1.20.2.tar.gz) = 18301262
diff --git a/www/mediawiki120/pkg-descr b/www/mediawiki120/pkg-descr
new file mode 100644
index 000000000000..dac83f83ccda
--- /dev/null
+++ b/www/mediawiki120/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/
diff --git a/www/mediawiki120/pkg-message b/www/mediawiki120/pkg-message
new file mode 100644
index 000000000000..d98978fe6903
--- /dev/null
+++ b/www/mediawiki120/pkg-message
@@ -0,0 +1,11 @@
+
+	**** NOTE ****
+Remember to check
+
+%%MEDIAWIKIDIR%%/INSTALL
+
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
+for details