diff --git a/FAQ.md b/FAQ.md
index e750c170..4c5e0cb5 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -24,3 +24,10 @@ A: Settings -> Personalize -> Fullscreen controls -> Enable (this will only be v
 
 #### Q: Why are gallery or random pictures showing up as album art?
 A: Settings -> Images -> Ignore media store covers -> Enable
+
+#### Q: Which file types are supported?
+A: Retro Music uses the native media player that comes with your Android phone, so as long as a file type is supported by your phone, it's supported by Retro Music.
+
+#### Q: Why is my device slowing down when I'm using the app?
+A: Retro Music is image intensive, it keeps images in the cache for quick loading.
+
diff --git a/README.md b/README.md
index 95ac4796..0499732f 100644
--- a/README.md
+++ b/README.md
@@ -27,3 +27,8 @@ Retro Music is an open source, local music player for Android.
 #### License
 
 Retro Music Player is released under the GNU General Public License v3.0 (GPLv3), which can be found here: [License](LICENSE.md)
+
+#### FAQ [Here](https://github.com/h4h13/RetroMusicPlayer/blob/master/FAQ.md)
+
+#### Change-Log and Release [Here](https://github.com/h4h13/RetroMusicPlayer/releases)
+