diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6582ef04e3..faef3d78cc 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,24 +4,31 @@
 
 ### Setup
 
- - Which version of Git for Windows are you using? 32-bit or 64-bit? Include the
-   output of `git version` as well.
-
- _TODO_
+ - Which version of Git for Windows are you using? Is it 32-bit or 64-bit?
 
 ```
-$ git --version
+$ git --version --build-options
 _TODO_
 ```
 
- - Which version of Windows are you running? 32-bit or 64-bit?
+ - Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?
 
- _TODO_
+```
+$ cmd.exe /c ver
+_TODO_
+```
 
  - What options did you set as part of the installation? Or did you choose the
    defaults?
 
- _TODO_
+```
+# One of the following:
+> type "C:\Program Files\Git\etc\install-options.txt"
+> type "C:\Program Files (x86)\Git\etc\install-options.txt"
+> type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
+$ cat /etc/install_options.txt
+_TODO_
+```
 
  - Any other interesting things about your environment that might be related
    to the issue you're seeing?