diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 05a33859273e..5cc2581d79dc 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -1,84 +1,85 @@
 # $FreeBSD$
 
 PORTNAME=	icinga2
 DISTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Monitoring and management system for hosts, services and networks
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		libyajl.so:${PORTSDIR}/devel/yajl \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
 USES=		alias bison cmake
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	MYSQL PGSQL
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 
 OPTIONS_DEFAULT=	MYSQL PGSQL MONPLUGINS
 
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
 MYSQL_CMAKE_ON=	-DICINGA2_WITH_MYSQL:BOOL=true
 PGSQL_CMAKE_ON=	-DICINGA2_WITH_PGSQL:BOOL=true
 
 ICINGA2USER?=	icinga
 ICINGA2GROUP?=	icinga
 USERS=		${ICINGA2USER}
 GROUPS=		${ICINGA2GROUP}
 
 LOCALSTATEDIR?=	/var
 ICINGA2LOGDIR?=	/var/log/${PORTNAME}
 
 CMAKE_ARGS+=	-DICINGA2_USER=${ICINGA2USER} \
 		-DICINGA2_GROUP=${ICINGA2GROUP} \
 		-DICINGA2_COMMAND_USER=${ICINGA2USER} \
 		-DICINGA2_COMMAND_GROUP=${ICINGA2USER} \
 		-DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \
 		-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \
 		-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \
 
 SUB_LIST=	ICINGA2LOGDIR=${ICINGA2LOGDIR} \
 		ICINGA2USER=${ICINGA2USER} \
 		ICINGA2GROUP=${ICINGA2GROUP} \
 		WWWGRP=${WWWGRP}
 
 # Config files with references to "Linux"
 LINUX_CONFIG=	groups.conf services.conf hosts.conf
 
 MYSQL_USE=	mysql=yes
 PGSQL_USES=	pgsql
 
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	flex>=2.5.31:${PORTSDIR}/textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
 CXXFLAGS+=	-I${LOCALBASE}/include/flex
 .endif
 
 post-patch:
 .for f in ${LINUX_CONFIG}
 	${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f}
 .endfor
 
 pre-install:
 	${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \;
 	${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \
 		-exec ${MV} {} {}.sample \;
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/icinga2/files/patch-CMakeLists.txt b/net-mgmt/icinga2/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..2a5b562abb2f
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2014-11-24 21:13:28.953855765 +0100
++++ CMakeLists.txt	2014-11-24 21:13:39.486871283 +0100
+@@ -28,8 +28,8 @@
+       FORCE)
+ endif()
+ 
+-option(ICINGA2_WITH_MYSQL "MySQL support" ON)
+-option(ICINGA2_WITH_PGSQL "PostgreSQL support" ON)
++option(ICINGA2_WITH_MYSQL "MySQL support" OFF)
++option(ICINGA2_WITH_PGSQL "PostgreSQL support" OFF)
+ 
+ file(STRINGS icinga2.spec VERSION_LINE REGEX "^Version: ")
+ string(REPLACE "Version: " "" ICINGA2_VERSION ${VERSION_LINE})
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 5b8a1034c2f1..2c691f0916f0 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -1,106 +1,106 @@
 etc/bash_completion.d/icinga2
 @sample %%ETCDIR%%/conf.d/commands.conf.sample
 @sample %%ETCDIR%%/conf.d/downtimes.conf.sample
 @sample %%ETCDIR%%/conf.d/groups.conf.sample
 @sample %%ETCDIR%%/conf.d/hosts.conf.sample
 @sample %%ETCDIR%%/conf.d/notifications.conf.sample
 @sample %%ETCDIR%%/conf.d/satellite.conf.sample
 @sample %%ETCDIR%%/conf.d/services.conf.sample
 @sample %%ETCDIR%%/conf.d/templates.conf.sample
 @sample %%ETCDIR%%/conf.d/timeperiods.conf.sample
 @sample %%ETCDIR%%/conf.d/users.conf.sample
 @sample %%ETCDIR%%/constants.conf.sample
 @sample %%ETCDIR%%/features-available/api.conf.sample
 @sample %%ETCDIR%%/features-available/checker.conf.sample
 @sample %%ETCDIR%%/features-available/command.conf.sample
 @sample %%ETCDIR%%/features-available/compatlog.conf.sample
 @sample %%ETCDIR%%/features-available/debuglog.conf.sample
 @sample %%ETCDIR%%/features-available/gelf.conf.sample
 @sample %%ETCDIR%%/features-available/graphite.conf.sample
 @sample %%ETCDIR%%/features-available/icingastatus.conf.sample
 @sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample
 @sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-pgsql.conf.sample
 @sample %%ETCDIR%%/features-available/livestatus.conf.sample
 @sample %%ETCDIR%%/features-available/mainlog.conf.sample
 @sample %%ETCDIR%%/features-available/notification.conf.sample
 @sample %%ETCDIR%%/features-available/perfdata.conf.sample
 @sample %%ETCDIR%%/features-available/statusdata.conf.sample
 @sample %%ETCDIR%%/features-available/syslog.conf.sample
 %%ETCDIR%%/features-enabled/checker.conf
 %%ETCDIR%%/features-enabled/mainlog.conf
 %%ETCDIR%%/features-enabled/notification.conf
 @sample %%ETCDIR%%/icinga2.conf.sample
 @sample %%ETCDIR%%/init.conf.sample
 %%ETCDIR%%/repository.d/README
 @sample %%ETCDIR%%/scripts/mail-host-notification.sh.sample
 @sample %%ETCDIR%%/scripts/mail-service-notification.sh.sample
 @sample %%ETCDIR%%/zones.conf.sample
 %%ETCDIR%%/zones.d/README
 lib/icinga2/libbase.so
 lib/icinga2/libchecker.so
 lib/icinga2/libcli.so
 lib/icinga2/libcompat.so
 lib/icinga2/libconfig.so
 lib/icinga2/libdb_ido.so
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
 lib/icinga2/libdemo.so
 lib/icinga2/libexecvpe.so
 lib/icinga2/libhello.so
 lib/icinga2/libicinga.so
 lib/icinga2/liblivestatus.so
 lib/icinga2/libmethods.so
 lib/icinga2/libmmatch.so
 lib/icinga2/libnotification.so
 lib/icinga2/libperfdata.so
 lib/icinga2/libremote.so
 man/man8/icinga2-prepare-dirs.8.gz
 man/man8/icinga2.8.gz
 sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.Exceptions
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/1-about.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/2-getting-started.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/3-troubleshooting.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/4-monitoring-basics.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/5-monitoring-remote-systems.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/6-addons-plugins.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/7-configuring-icinga-2.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/8-migration.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/9-appendix.md
-%%DATADIR%%-ido-mysql/schema/mysql.sql
-%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql
-%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql
-%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql
-%%DATADIR%%-ido-pgsql/schema/pgsql.sql
-%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql
-%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql
-%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/mysql.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/pgsql.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql
 %%DATADIR%%/include/command-icinga.conf
 %%DATADIR%%/include/command-plugins-manubulon.conf
 %%DATADIR%%/include/command-plugins.conf
 %%DATADIR%%/include/command.conf
 %%DATADIR%%/include/itl
 %%DATADIR%%/include/manubulon
 %%DATADIR%%/include/plugins
 %%DATADIR%%/include/timeperiod.conf
 @dir %%ETCDIR%%/pki
 @dir /var/cache/icinga2
 @dir /var/lib/icinga2/api/log
 @dir /var/lib/icinga2/api/repository
 @dir /var/lib/icinga2/api/zones
 @dir /var/lib/icinga2/api
 @dir /var/lib/icinga2
 @dir /var/lib
 @dir /var/log/icinga2/compat/archives
 @dir /var/log/icinga2/compat
 @dir /var/log/icinga2
 @dir /var/run/icinga2/cmd
 @dir /var/run/icinga2
 @dir /var/spool/icinga2/perfdata
 @dir /var/spool/icinga2/tmp
 @dir /var/spool/icinga2