diff --git a/aircox/templates/aircox/episode_detail.html b/aircox/templates/aircox/episode_detail.html
index 9167c8c..8da3606 100644
--- a/aircox/templates/aircox/episode_detail.html
+++ b/aircox/templates/aircox/episode_detail.html
@@ -5,6 +5,19 @@
 {% include "aircox/program_sidebar.html" %}
 
 
+{% block top-nav-tools %}
+{% has_perm page page.program.change_permission_codename simple=True as can_edit %}
+{% if can_edit %}
+<a class="navbar-item" href="{% url 'episode-edit' page.pk %}" target="_self">
+    <span class="icon is-small">
+        <i class="fa fa-pen"></i>
+    </span>&nbsp;
+    <span>{% translate "Edit" %}</span>
+</a>
+{% endif %}
+{% endblock %}
+
+
 {% block content %}
 <a-episode :page="{title: &quot;{{ page.title }}&quot;, podcasts: {{ object.podcasts|json }}}">
 <template v-slot="{podcasts,page}">
diff --git a/aircox/templates/aircox/episode_form.html b/aircox/templates/aircox/episode_form.html
new file mode 100644
index 0000000..e86f672
--- /dev/null
+++ b/aircox/templates/aircox/episode_form.html
@@ -0,0 +1,30 @@
+{% extends "aircox/basepage_detail.html" %}
+{% load static i18n humanize honeypot aircox %}
+
+
+{% block head_extra %}
+  {{ form.media }}
+{% endblock %}
+
+{% block init-scripts %}
+{% endblock %}
+
+{% block top-nav-tools %}
+<a class="navbar-item" href="{% url 'episode-detail' object.slug %}" target="_self">
+    <span class="icon is-small">
+        <i class="fa fa-eye"></i>
+    </span>&nbsp;
+    <span>{% translate "View" %}</span>
+</a>
+{% endblock %}
+
+{% block main %}
+<form method="post" enctype="multipart/form-data">{% csrf_token %}
+    <table>
+        {{ form.as_table }}
+        {% render_honeypot_field "website" %}
+    </table>
+    <br/>
+    <input type="submit" value="Update" class="button is-success">
+</form>
+{% endblock %}
diff --git a/aircox/templates/aircox/widgets/episode_item.html b/aircox/templates/aircox/widgets/episode_item.html
index 2355018..6995fcd 100644
--- a/aircox/templates/aircox/widgets/episode_item.html
+++ b/aircox/templates/aircox/widgets/episode_item.html
@@ -47,6 +47,13 @@ Context variables:
 
 
 {% block actions %}
+{% has_perm page object.program.change_permission_codename simple=True as can_edit %}
+{% if can_edit %}
+  <a class="button" href="{% url 'episode-edit' object.pk %}" target="_self">
+    <span class="icon is-small"><i class="fas fa-pen" alt="{% trans 'edit' %}"></i></span>
+  </a>
+{% endif %}
+
 {% if object.sound_set.public.count %}
 <button class="button" @click="player.playButtonClick($event)"
         data-sounds="{{ object.podcasts|json }}">
diff --git a/aircox/urls.py b/aircox/urls.py
index 3c6741c..16241a0 100755
--- a/aircox/urls.py
+++ b/aircox/urls.py
@@ -97,6 +97,11 @@ urls = [
         views.ProgramUpdateView.as_view(),
         name="program-edit",
     ),
+    path(
+        _("episode/<pk>/edit/"),
+        views.EpisodeUpdateView.as_view(),
+        name="episode-edit",
+    ),
     path(
         _("programs/<slug:parent_slug>/episodes/"),
         views.EpisodeListView.as_view(),
diff --git a/aircox/views/__init__.py b/aircox/views/__init__.py
index 2d30211..dc44bef 100644
--- a/aircox/views/__init__.py
+++ b/aircox/views/__init__.py
@@ -2,7 +2,7 @@ from . import admin, errors
 from .article import ArticleDetailView, ArticleListView
 from .base import BaseAPIView, BaseView
 from .diffusion import DiffusionListView
-from .episode import EpisodeDetailView, EpisodeListView
+from .episode import EpisodeDetailView, EpisodeListView, EpisodeUpdateView
 from .home import HomeView
 from .log import LogListAPIView, LogListView
 from .page import (
@@ -30,6 +30,7 @@ __all__ = (
     "DiffusionListView",
     "EpisodeDetailView",
     "EpisodeListView",
+    "EpisodeUpdateView",
     "HomeView",
     "LogListAPIView",
     "LogListView",
diff --git a/aircox/views/episode.py b/aircox/views/episode.py
index e53dd19..226f336 100644
--- a/aircox/views/episode.py
+++ b/aircox/views/episode.py
@@ -1,7 +1,17 @@
+from django.contrib.auth.mixins import UserPassesTestMixin
+from django.forms import ModelForm, FileField
+from django.urls import reverse
+
+from ckeditor.fields import RichTextField
+from filer.models.filemodels import File
+
+from aircox.controllers.sound_file import SoundFile
+
 from ..filters import EpisodeFilters
 from ..models import Episode, Program, StaticPage
 from .page import PageListView
-from .program import ProgramPageDetailView
+from .program import ProgramPageDetailView, BaseProgramMixin
+from .page import PageUpdateView
 
 __all__ = (
     "EpisodeDetailView",
@@ -25,3 +35,36 @@ class EpisodeListView(PageListView):
     has_headline = True
     parent_model = Program
     attach_to_value = StaticPage.ATTACH_TO_EPISODES
+
+
+class EpisodeForm(ModelForm):
+    content = RichTextField()
+    new_podcast = FileField(required=False)
+
+    class Meta:
+        model = Episode
+        fields = ["content"]
+
+    def save(self, commit=True):
+        file_obj = self.cleaned_data["new_podcast"]
+        if file_obj:
+            obj, _ = File.objects.get_or_create(original_filename=file_obj.name, file=file_obj)
+            sound_file = SoundFile(obj.path)
+            sound_file.sync(
+                program=self.instance.program, episode=self.instance, type=0, is_public=True, is_downloadable=True
+            )
+
+
+class EpisodeUpdateView(UserPassesTestMixin, BaseProgramMixin, PageUpdateView):
+    model = Episode
+    form_class = EpisodeForm
+
+    def get_sidebar_queryset(self):
+        return super().get_sidebar_queryset().filter(parent=self.program)
+
+    def test_func(self):
+        program = self.get_object().program
+        return self.request.user.has_perm("aircox.%s" % program.change_permission_codename)
+
+    def get_success_url(self):
+        return reverse("episode-detail", kwargs={"slug": self.get_object().slug})