diff --git a/src/study.c b/src/study.c
index 1dd4da8b8..f3372334a 100644
--- a/src/study.c
+++ b/src/study.c
@@ -53,6 +53,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/rng.h>
 #include <util/umlaut.h>
 
+#include <quicklist.h>
+
 /* libc includes */
 #include <assert.h>
 #include <limits.h>
@@ -216,24 +218,11 @@ teach_unit(unit * teacher, unit * student, int nteaching, skill_t sk,
     n = _min(n, nteaching);
 
     if (n != 0) {
-        int index = 0;
-
         if (teach == NULL) {
             a = a_add(&student->attribs, a_new(&at_learning));
             teach = (teaching_info *)a->data.v;
         }
-        else {
-            while (teach->teachers[index] && index != MAXTEACHERS)
-                ++index;
-        }
-        if (index < MAXTEACHERS)
-            teach->teachers[index++] = teacher;
-        if (index < MAXTEACHERS) {
-            teach->teachers[index] = NULL;
-        }
-        else {
-            log_error("MAXTEACHERS=%d is too low for student %s, teacher %s", MAXTEACHERS, unitname(student), unitname(teacher));
-        }
+        ql_push(&teach->teachers, teacher);
         teach->value += n;
 
         if (student->building && teacher->building == student->building) {
@@ -717,7 +706,7 @@ int study_cmd(unit * u, order * ord)
         a = a_add(&u->attribs, a_new(&at_learning));
         teach = (teaching_info *)a->data.v;
         assert(teach);
-        teach->teachers[0] = 0;
+        teach->teachers = NULL;
     }
     if (money > 0) {
         use_pooled(u, get_resourcetype(R_SILVER), GET_DEFAULT, money);
@@ -766,9 +755,9 @@ int study_cmd(unit * u, order * ord)
 
     learn_skill(u, sk, days);
     if (a != NULL) {
-        int index = 0;
-        while (teach->teachers[index] && index != MAXTEACHERS) {
-            unit *teacher = teach->teachers[index++];
+        ql_iter qli = qli_init(&teach->teachers);
+        while (qli_more(qli)) {
+            unit *teacher = (unit *)qli_next(&qli);
             if (teacher->faction != u->faction) {
                 bool feedback = alliedunit(u, teacher->faction, HELP_GUARD);
                 if (feedback) {
diff --git a/src/study.h b/src/study.h
index 20903583a..8067bc9bd 100644
--- a/src/study.h
+++ b/src/study.h
@@ -27,6 +27,7 @@ extern "C" {
 #endif
 
     struct unit;
+    struct quicklist;
 
     int teach_cmd(struct unit *u, struct order *ord);
     int study_cmd(struct unit *u, struct order *ord);
@@ -45,10 +46,9 @@ extern "C" {
 
     void demon_skillchange(struct unit *u);
 
-#define MAXTEACHERS 32
 #define TEACHNUMBER 10
     typedef struct teaching_info {
-        struct unit *teachers[MAXTEACHERS];
+        struct quicklist *teachers;
         int value;
     } teaching_info;
 
diff --git a/src/study.test.c b/src/study.test.c
index 54e32bf28..4c1e5f171 100644
--- a/src/study.test.c
+++ b/src/study.test.c
@@ -18,9 +18,11 @@
 #include <util/base36.h>
 #include <tests.h>
 
+#include <CuTest.h>
+#include <quicklist.h>
+
 #include <assert.h>
 
-#include <CuTest.h>
 
 #define MAXLOG 4
 typedef struct log_entry {
@@ -537,9 +539,9 @@ static void test_teach_message(CuTest *tc) {
     teach = (teaching_info *)a->data.v;
     CuAssertPtrNotNull(tc, teach->teachers);
     CuAssertIntEquals(tc, 600, teach->value);
-    CuAssertPtrEquals(tc, u1, teach->teachers[0]);
-    CuAssertPtrEquals(tc, u2, teach->teachers[1]);
-    CuAssertPtrEquals(tc, NULL, teach->teachers[2]);
+    CuAssertIntEquals(tc, 2, ql_length(teach->teachers));
+    CuAssertPtrEquals(tc, u1, ql_get(teach->teachers, 0));
+    CuAssertPtrEquals(tc, u2, ql_get(teach->teachers, 1));
     study_cmd(u, u->thisorder);
     CuAssertPtrEquals(tc, NULL, test_find_messagetype(u1->faction->msgs, "teach_teacher"));
     CuAssertPtrNotNull(tc, test_find_messagetype(u2->faction->msgs, "teach_teacher"));