diff --git a/productions/forms.py b/productions/forms.py
index 6def112e1..b60b6d162 100644
--- a/productions/forms.py
+++ b/productions/forms.py
@@ -296,7 +296,8 @@ def save(self, commit=True):
 
 	class Meta:
 		model = ProductionLink
-		exclude = ['parameter', 'link_class', 'production', 'is_download_link', 'description', 'demozoo0_id', 'file_for_screenshot', 'is_unresolved_for_screenshotting']
+		exclude = ['parameter', 'link_class', 'production', 'is_download_link', 'demozoo0_id', 'file_for_screenshot', 'is_unresolved_for_screenshotting']
+		widgets = {'description': forms.TextInput(attrs={'placeholder': 'Optional description, like "party version"'})}
 
 ProductionDownloadLinkFormSet = inlineformset_factory(Production, ProductionLink,
 	form=ProductionDownloadLinkForm, formset=BaseExternalLinkFormSet, extra=2)
@@ -318,7 +319,8 @@ def save(self, commit=True):
 
 	class Meta:
 		model = ProductionLink
-		exclude = ['parameter', 'link_class', 'production', 'is_download_link', 'description', 'demozoo0_id', 'file_for_screenshot', 'is_unresolved_for_screenshotting']
+		exclude = ['parameter', 'link_class', 'production', 'is_download_link', 'demozoo0_id', 'file_for_screenshot', 'is_unresolved_for_screenshotting']
+		widgets = {'description': forms.TextInput(attrs={'placeholder': 'Optional description, like "party version"'})}
 
 ProductionExternalLinkFormSet = inlineformset_factory(Production, ProductionLink,
 	form=ProductionExternalLinkForm, formset=BaseExternalLinkFormSet)
diff --git a/productions/templates/productions/_downloads.html b/productions/templates/productions/_downloads.html
index cdb860646..853348f19 100644
--- a/productions/templates/productions/_downloads.html
+++ b/productions/templates/productions/_downloads.html
@@ -12,7 +12,7 @@ <h3 class="panel__title">Downloads</h3>
 	<ul class="download_links">
 		{% for link in download_links %}
 			<li class="download_link {{ link.html_link_class }}">
-				{{ link.as_download_link|safe }}
+				{{ link.as_download_link|safe }}{%if link.description %} ({{ link.description }}){% endif %}
 			</li>
 		{% endfor %}
 	</ul>
diff --git a/productions/templates/productions/_external_links.html b/productions/templates/productions/_external_links.html
index 1780384ed..05d7166a5 100644
--- a/productions/templates/productions/_external_links.html
+++ b/productions/templates/productions/_external_links.html
@@ -11,7 +11,7 @@ <h3 class="panel__title">External links</h3>
 	{% endif %}
 	<ul class="external_links">
 		{% for link in external_links %}
-			<li>{{ link.html_link|safe }}</li>
+			<li>{{ link.html_link|safe }}{%if link.description %} ({{ link.description }}){% endif %}</li>
 		{% endfor %}
 	</ul>
 </div>
diff --git a/productions/templates/productions/edit_links.html b/productions/templates/productions/edit_links.html
index ca07a3c99..578f56dec 100644
--- a/productions/templates/productions/edit_links.html
+++ b/productions/templates/productions/edit_links.html
@@ -24,7 +24,8 @@ <h2>Editing {{ external_or_download }} links for {{ production.title }}:</h2>
 			<div class="field_input">
 				{% spawningformset formset %}
 					{% spawningform as form %}
-						{{ form.url }}
+						{{ form.url }}<br>
+						{{ form.description }}
 						{% for hidden in form.hidden_fields %}
 							{{ hidden }}
 						{% endfor %}