diff --git a/_includes/footer.html b/_includes/footer.html
index cd28480..7a3e8b1 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -7,9 +7,9 @@
 		</ul>
 		<ul class="style">
 			<li><a href="/contribute">Contribute</a></li>
+			<li><a href="/contribute/report-a-bug">Reporting a bug</a></li>
 			<li><a href="http://wiki.qemu-project.org/Documentation/GettingStartedDevelopers">New contributors</a></li>
 			<li><a href="http://wiki.qemu-project.org/Contribute/SubmitAPatch">Submitting a patch</a></li>
-			<li><a href="http://wiki.qemu-project.org/Contribute/ReportABug">Reporting a bug</a></li>
 			<li><a href="http://wiki.qemu-project.org/Contribute/FAQ">Contributor FAQ</a></li>
 		</ul>
 		<ul class="style">
diff --git a/contribute.md b/contribute.md
index fb2238d..e052654 100644
--- a/contribute.md
+++ b/contribute.md
@@ -3,7 +3,7 @@ title: Contribute to QEMU!
 permalink: /contribute/
 ---
 
-* Report a bug: https://bugs.launchpad.net/qemu/<br>[How to report a bug](http://wiki.qemu-project.org/Contribute/ReportABug)
+* Report a bug: https://bugs.launchpad.net/qemu/<br>[How to report a bug](report-a-bug/)
 
 * Clone the git repository: <br>`git clone git://git.qemu-project.org/qemu.git`
 
diff --git a/contribute/report-a-bug.md b/contribute/report-a-bug.md
new file mode 100644
index 0000000..c96601b
--- /dev/null
+++ b/contribute/report-a-bug.md
@@ -0,0 +1,19 @@
+---
+title: Reporting a bug
+permalink: /contribute/report-a-bug
+---
+
+Bugs can be filed at our [bug tracker](https://bugs.launchpad.net/qemu/), which is hosted on Launchpad.
+
+When submitting a bug report, please try to do the following:
+
+* Make sure you're reporting the bug against the [latest release](/download/#source).  If possible, please try to reproduce with the latest development tree too.
+
+* Include the full command line used to launch the QEMU guest.
+
+* Reproduce the problem directly with a QEMU command-line.  Avoid frontends and management stacks, to ensure that the bug is in QEMU itself and not in a frontend.
+
+* Include as information about the guest (operating system, version, 32/64-bit).
+
+* Do not contribute patches on the bug tracker; send patches to the mailing list. Follow QEMU's [guidelines about submitting patches](http://wiki.qemu.org/Contribute/SubmitAPatch).
+