diff --git a/Home.md b/Home.md
deleted file mode 100644
index 982158d..0000000
--- a/Home.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Welcome to the mkvtoolnix wiki!
-[FTP server](FTP-server)
\ No newline at end of file
diff --git a/MKVToolNix-FAQ-and-bug-tracker.md b/MKVToolNix-FAQ-and-bug-tracker.md
new file mode 100644
index 0000000..6abab53
--- /dev/null
+++ b/MKVToolNix-FAQ-and-bug-tracker.md
@@ -0,0 +1,12 @@
+# Welcome to the MKVToolNix FAQ and bug tracker
+
+This is the place to search through [existing bug reports](/mbunkus/mkvtoolnix/issues) (called "issues"), [open new ones](/mbunkus/mkvtoolnix/issues/new) and [browse the source code repository](/mbunkus/mkvtoolnix). You can also find the list of [frequently asked & answered questions (FAQ)](FAQ) here.
+
+# Uploading sample files
+
+When I ask you to upload a sample file then please upload it to [my FTP/SFTP server](FTP-server).
+
+# Other pages on this site
+
+ * [The MKVToolNix FAQ](FAQ)
+ * Starting point for playback issues: [troubleshooting advice and known issues in current releases](Troubleshooting)