diff --git a/fet2020/tasks/admin.py b/fet2020/tasks/admin.py
index 782e9418..878f9176 100644
--- a/fet2020/tasks/admin.py
+++ b/fet2020/tasks/admin.py
@@ -1,12 +1,21 @@
 from django.contrib import admin
 
-from .forms import TaskAdminForm, TaskListForm
-from .models import Task, TaskList
+from .forms import DocumentInlineForm, TaskAdminForm, TaskListAdminForm
+from .models import Document, Task, TaskList
+
+
+class DocumentInline(admin.TabularInline):
+    model = Document
+    form = DocumentInlineForm
+    extra = 0
+    verbose_name = "Dokument"
+    verbose_name_plural = "Do­ku­men­ten­samm­lung"
 
 
 class TaskAdmin(admin.ModelAdmin):
     form = TaskAdminForm
     model = Task
+    inlines = (DocumentInline,)
     fieldsets = (
         (
             None,
@@ -61,7 +70,7 @@ class TaskAdmin(admin.ModelAdmin):
 
 
 class TaskListAdmin(admin.ModelAdmin):
-    form = TaskListForm
+    form = TaskListAdminForm
     model = TaskList
 
     def add_view(self, request, form_url="", extra_context=None):
diff --git a/fet2020/tasks/forms.py b/fet2020/tasks/forms.py
index 9f2639e2..40964b71 100644
--- a/fet2020/tasks/forms.py
+++ b/fet2020/tasks/forms.py
@@ -12,6 +12,17 @@ class DateInput(forms.DateInput):
     input_type = "date"
 
 
+class DocumentInlineForm(forms.ModelForm):
+    class Meta:
+        model = Document
+        fields = [
+            "title",
+            "shortterm",
+            "slug",
+            "date",
+        ]
+
+
 class TaskAdminForm(forms.ModelForm):
     class Meta:
         model = Task
@@ -98,7 +109,7 @@ class TaskUpdateForm(forms.ModelForm):
         ].queryset.order_by("username")
 
 
-class TaskListForm(forms.ModelForm):
+class TaskListAdminForm(forms.ModelForm):
     users = forms.ModelMultipleChoiceField(
         label="Benutzer",
         help_text="Es können nur die Benutzer ausgewählt werden, die sich auf der Homepage angemeldet haben.",