diff --git a/.gitmodules b/.gitmodules
index e4790890ff8d8..b4a2ef2095920 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,3 +30,8 @@
 	path = admin/tool/ucsfsomapi
 	url = https://github.com/ucsf-education/tool_ucsfsomapi.git
 	branch = MOODLE_404_STABLE
+[submodule "mod/questionnaire"]
+	path = mod/questionnaire
+	url = https://github.com/PoetOS/moodle-mod_questionnaire
+	branch = MOODLE_404_STABLE
+	tag = v4.1.1
diff --git a/mod/questionnaire b/mod/questionnaire
new file mode 160000
index 0000000000000..f2ffa4696e51c
--- /dev/null
+++ b/mod/questionnaire
@@ -0,0 +1 @@
+Subproject commit f2ffa4696e51c25d1bb6d8950bc306ae2fd83a12