diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
similarity index 79%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE.md
index c5d873e6a..cdd64647f 100644
--- a/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-- [ ] I've read the [CONTRIBUTING](https://github.com/sbt/sbt/blob/1.x/CONTRIBUTING.md) guidelines
+- [ ] I've read the [CONTRIBUTING](https://github.com/sbt/sbt/blob/develop/CONTRIBUTING.md) guidelines
 
 ## steps
 
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 62%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md
index 47947ca33..aa1646f22 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1 +1 @@
-- [ ] I've read the [CONTRIBUTING](https://github.com/sbt/sbt/blob/1.x/CONTRIBUTING.md) guidelines
+- [ ] I've read the [CONTRIBUTING](https://github.com/sbt/sbt/blob/develop/CONTRIBUTING.md) guidelines
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6192a8846..54e5a8f6b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -130,7 +130,7 @@ Build from source
 
 sbt uses two branches for development:
 
-- Development branch: `1.x` (this is also called "master")
+- Development branch: `develop` (this is also called "master")
 - Stable branch: `1.$MINOR.x`, where `$MINOR` is current minor version (e.g. `1.1.x` during 1.1.x series)
 
 ### Instruction to build all modules from source
@@ -142,7 +142,7 @@ sbt uses two branches for development:
    $ mkdir sbt-modules
    $ cd sbt-modules
    $ for i in sbt io util librarymanagement zinc; do \
-     git clone https://github.com/sbt/$i.git && (cd $i; git checkout -b 1.x origin/1.x)
+     git clone https://github.com/sbt/$i.git && (cd $i; git checkout -b develop origin/develp)
    done
    $ cd sbt
    $ ./sbt-allsources.sh