diff --git a/app/flatpages/help/reporting.md b/app/flatpages/help/reporting.md
index 2ab75864..1b1beef1 100644
--- a/app/flatpages/help/reporting.md
+++ b/app/flatpages/help/reporting.md
@@ -5,4 +5,4 @@ laws.
 
 We take copyright violation and other offenses very seriously.
 
-<a href="https://rubenwardy.com/contact/" class="button btn_green">Contact</a>
+<a href="https://rubenwardy.com/contact/" class="btn btn-success">Contact</a>
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index d97e3769..bd49a873 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -289,6 +289,13 @@
 					{{ render_threadlist(threads, list_group=True) }}
 				</ul>
 			</div>
+
+			{% if package.approved and package.checkPerm(current_user, "CREATE_THREAD") and current_user != package.author and not current_user.rank.atLeast(current_user.rank.EDITOR) %}
+				<a class="float-right"
+					href="{{ url_for('new_thread_page', pid=package.id) }}">
+						Report a problem with this listing
+				</a>
+			{% endif %}
 		</aside>
 
 		{% if not package.approved and (package.author == current_user or package.checkPerm(current_user, "APPROVE_NEW")) %}
diff --git a/app/templates/threads/new.html b/app/templates/threads/new.html
index fec44685..ffe65326 100644
--- a/app/templates/threads/new.html
+++ b/app/templates/threads/new.html
@@ -6,6 +6,15 @@
 
 {% block content %}
 
+{% if package and current_user != package.author and not current_user.rank.atLeast(current_user.rank.EDITOR) %}
+	{% if package.issueTracker %}
+		<div class="alert alert-warning">
+		Found a bug? Post on the <a href="{{ package.issue_tracker }}">issue tracker</a> instead.<br />
+		If the package shouldn't be on CDB - for example, if it doesn't work at all - then please let us know here.
+		</div>
+	{% endif %}
+{% endif %}
+
 {% from "macros/forms.html" import render_field, render_submit_field, render_checkbox_field %}
 <form method="POST" action="" enctype="multipart/form-data">
 	{{ form.hidden_tag() }}
diff --git a/app/views/threads.py b/app/views/threads.py
index c168a23c..4972abdf 100644
--- a/app/views/threads.py
+++ b/app/views/threads.py
@@ -209,4 +209,4 @@ def new_thread_page():
 		return redirect(url_for("thread_page", id=thread.id))
 
 
-	return render_template("threads/new.html", form=form, allow_private_change=allow_change)
+	return render_template("threads/new.html", form=form, allow_private_change=allow_change, package=package)