Index: head/Mk/bsd.default-versions.mk
===================================================================
--- head/Mk/bsd.default-versions.mk
+++ head/Mk/bsd.default-versions.mk
@@ -82,7 +82,7 @@
 # Possible values: 7.1, 7.2, 7.3
 PHP_DEFAULT?=		7.2
 # Possible values: 2.7, 3.5, 3.6, 3.7
-PYTHON_DEFAULT?=	2.7
+PYTHON_DEFAULT?=	3.6
 # Possible values: 2.7
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.5, 3.6, 3.7
Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -5,6 +5,15 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20190410:
+  AFFECTS: users of python
+  AUTHOR: antoine@FreeBSD.org
+
+  Default version of python was switched to 3.6.
+
+  For ports users wanting to keep version 2.7 as default,
+  add DEFAULT_VERSIONS+= python=2.7 to make.conf
+
 20190328:
   AFFECTS: www/firefox-i18n, www/firefox-esr-i18n, mail/thunderbird-i18n, www/seamonkey-i18n
   AUTHOR: gecko@FreeBSD.org
Index: head/devel/libpeas/Makefile
===================================================================
--- head/devel/libpeas/Makefile
+++ head/devel/libpeas/Makefile
@@ -38,7 +38,7 @@
 USES+=		python
 USE_PYTHON=	flavors
 USE_GNOME+=	pygobject3
-.if ${FLAVOR:Upy27:Mpy2*}
+.if ${FLAVOR:Upy36:Mpy2*}
 CONFIGURE_ARGS+=	--disable-python3
 BUILD_WRKSRC=	${WRKSRC}/loaders/python
 INSTALL_WRKSRC=	${WRKSRC}/loaders/python
Index: head/mail/py-milter/Makefile
===================================================================
--- head/mail/py-milter/Makefile
+++ head/mail/py-milter/Makefile
@@ -31,7 +31,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${FLAVOR:Upy27:Mpy3*}
+.if ${FLAVOR:Upy36:Mpy3*}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-miltermodule.c
 .endif
 
Index: head/math/py-matplotlib/Makefile
===================================================================
--- head/math/py-matplotlib/Makefile
+++ head/math/py-matplotlib/Makefile
@@ -35,7 +35,7 @@
 			QT5AGGBACKEND TKAGGBACKEND WXAGGBACKEND
 OPTIONS_DEFAULT=	GTKBACKEND GTKAGGBACKEND TKAGGBACKEND
 OPTIONS_SUB=		yes
-.if ${FLAVOR:U:Mpy3*}
+.if ${FLAVOR:Upy36:Mpy3*}
 # x11-toolkits/py-gtk2, x11-toolkits/py-wxPython28 do not support Python 3
 OPTIONS_EXCLUDE=	GTKBACKEND GTKAGGBACKEND WXAGGBACKEND
 .endif
Index: head/textproc/py-enchant/Makefile
===================================================================
--- head/textproc/py-enchant/Makefile
+++ head/textproc/py-enchant/Makefile
@@ -20,7 +20,7 @@
 OPTIONS_DEFAULT=WX
 WX_DESC=	Provide a wxSpellCheckerDialog
 OPTIONS_SUB=	yes
-.if ${FLAVOR:U:Mpy3*}
+.if ${FLAVOR:Upy36:Mpy3*}
 OPTIONS_EXCLUDE=	WX
 .endif