diff --git a/www/moodle310/Makefile b/www/moodle310/Makefile
index bedd8ff37ff3..157ad48b69b7 100644
--- a/www/moodle310/Makefile
+++ b/www/moodle310/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Course management system based on social constructionism
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle39-3.9.[0-9]*
+CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd hash iconv intl json mbstring \
diff --git a/www/moodle310/files/pkg-message.in b/www/moodle310/files/pkg-message.in
index b17b53d32fdb..37df4d2c6272 100644
--- a/www/moodle310/files/pkg-message.in
+++ b/www/moodle310/files/pkg-message.in
@@ -50,7 +50,7 @@ EOM
 If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
-   https://docs.moodle.org/37/en/Upgrading
+   https://docs.moodle.org/310/en/Upgrading
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.
diff --git a/www/moodle39/Makefile b/www/moodle39/Makefile
index 115cc0de3908..b29b9127c4a8 100644
--- a/www/moodle39/Makefile
+++ b/www/moodle39/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Course management system based on social constructionism
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle310-3.10.[0-9]*
+CONFLICTS=	moodle310-3.10.[0-9]* moodle311-3.11
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd hash iconv intl json mbstring \
diff --git a/www/moodle39/files/pkg-message.in b/www/moodle39/files/pkg-message.in
index b17b53d32fdb..cbacf4046c5e 100644
--- a/www/moodle39/files/pkg-message.in
+++ b/www/moodle39/files/pkg-message.in
@@ -50,7 +50,7 @@ EOM
 If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
-   https://docs.moodle.org/37/en/Upgrading
+   https://docs.moodle.org/39/en/Upgrading
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.