diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 2af53b8..61666da 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -8,6 +8,7 @@ assignees: ''
 ---
 
 PLEASE, FOLLOW AS CLOSELY AS POSSIBLE THE FOLLOWING SCRIPT TO FILL A BUG REPORT (and remove hints and instructions)
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -27,7 +28,7 @@ If applicable, add screenshots to help explain your problem.
  - Server Software: [e.g. xrdp]
  - Server Software Version: [e.g. 1.5.1]
 
-** Checklist **
+**Checklist**
 - [ ] This bug prevents me from using rdesktop
 - [ ] This bug is a security issue
 - [ ] This bug causes a bad experience with rdesktop
diff --git a/.github/ISSUE_TEMPLATE/feature-suggestion.md b/.github/ISSUE_TEMPLATE/feature-suggestion.md
new file mode 100644
index 0000000..8243a86
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-suggestion.md
@@ -0,0 +1,29 @@
+---
+name: FEATURE SUGGESTION
+about: Suggest an idea for rdesktop
+title: "[FS]"
+labels: ''
+assignees: ''
+
+---
+
+PLEASE, TAKE THIS TEMPLATE AS A SCRIPT TO HELP YOU TO THINK AS CONCRETELY AS POSSIBLE ABOUT THE PROPOSED FEATURE THAT DON'T NEED TO BE STRICTLY FOLLOWED. (remove this message before posting)
+
+**Brief Description**
+Shortly describe the feature you are proposing (1-3 phrases).
+
+**Needs or Improvements**
+The user needs your feature suggestion are intended to satisfy and/or to satisfy in a better way (i.e. know when the connection is decreasing in quality).
+
+**The proposed feature is**
+- [ ] A feature to satisfy a new need that is not currently satisfied
+- [ ] A feature to improve the way an already met need is satisfied
+
+**Detailed Solution**
+Describe how the proposed feature would work, how it would be used, etc
+
+**Expected Interface**
+Describe how the interface for this feature would be (i.e. a `-f FILENAME` argument to the command line). 
+
+**Requirements**
+Optionally, add a list of specific requirements for this feature