diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 523e0cb8..74f1e2e1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,6 +9,7 @@ This is possibly a generic guideline for contributing any Firefox addon project
 A good report is the fastest way to solve a problem.
 Even if the problem is very clear for you, possibly unclear for me.
 Unclear report can be left unfixed for long time.
+You'll see an example of [good report](https://github.com/piroor/treestyletab/issues/1134) and [another report with too less information](https://github.com/piroor/treestyletab/issues/1135).
 
 Here is a list of typical questions I asked to existing reports:
 
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 9181f33f..4e1dc163 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -7,9 +7,10 @@ https://github.com/piroor/treestyletab/blob/master/CONTRIBUTING.md
 
 ## Steps to reproduce
 
- 1. 
- 2. 
+ 1. Start Filrefox with clean profile.
+ 2. Install TST.
  3. 
+ 4. 
 
 ## Expected result
 
diff --git a/content/treestyletab/treestyletab.css b/content/treestyletab/treestyletab.css
index ed04eb82..b9583ea1 100644
--- a/content/treestyletab/treestyletab.css
+++ b/content/treestyletab/treestyletab.css
@@ -425,6 +425,7 @@ toolbar.treestyletab-tabbar-toolbar-ready:not([nowindowdrag="true"]),
 	-moz-appearance: none !important;
 	line-height: 0 !important; /* to avoid an useless space above the tab bar */
 	position: fixed !important;
+	-moz-window-dragging: default !important;
 }
 .treestyletab-tabbar-toolbar:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tabs,
diff --git a/history.en.md b/history.en.md
index fe4a4dce..147dd8bf 100644
--- a/history.en.md
+++ b/history.en.md
@@ -1,6 +1,9 @@
 # History
 
  - master/HEAD
+ - 0.17.2016061501
+   * Scrollbar in the tab bar couldn't operated by mouse if you show the menu bar, at Firefox 47 on Windows.
+   * The tab bar was wrongly fixed to "overflowed" state after you shrink the tab bar too narrow.
    * Better compatibility with the "Dark" theme of Firefox Developer Edition.
    * Better compatibility with FireGestures.
    * The width of expanded tab bar isn't enlarged too much, when shrunken tab bar is going to be wider than expanded tab bar.
diff --git a/history.ja.md b/history.ja.md
index 7e46ad43..8671b84f 100644
--- a/history.ja.md
+++ b/history.ja.md
@@ -1,6 +1,9 @@
 # 更新履歴
 
  - master/HEAD
+ - 0.17.2016061501
+   * Firefox 47で、Windowsにおいてメニューバーを表示するとタブバー内のスクロールバーをマウスで操作できなくなる問題を修正
+   * タブバーの幅を極端に縮めた後、タブバーがoverflowの状態のままになることがあったのを修正
    * Firefox Developer EditionのDarkテーマとの互換性を向上
    * FireGesturesとの互換性を向上
    * 縮められたタブバーの幅を変更するときに、展開されたタブバーの幅が異常に大きくなることがあったのを修正
diff --git a/install.rdf b/install.rdf
index 7609c439..541aacf6 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="treestyletab@piro.sakura.ne.jp"
                    em:name="Tree Style Tab"
-                   em:version="0.17.2016031101"
+                   em:version="0.17.2016061501"
                    em:creator="YUKI &quot;Piro&quot; Hiroshi"
                    em:description="Show tabs like a tree."
                    em:homepageURL="http://piro.sakura.ne.jp/xul/_treestyletab.html.en"
@@ -262,7 +262,7 @@
     <em:targetApplication>
       <RDF:Description em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
                        em:minVersion="38.0"
-                       em:maxVersion="48.0a1" />
+                       em:maxVersion="50.0a1" />
     </em:targetApplication>
   </RDF:Description>
 </RDF:RDF>
diff --git a/makexpi b/makexpi
index 4c4c7fa4..b77413dd 160000
--- a/makexpi
+++ b/makexpi
@@ -1 +1 @@
-Subproject commit 4c4c7fa463c939c7027935347e117bb066f0fef2
+Subproject commit b77413ddf78ef19aab1c29a0e7bc96c164d0f300