diff --git a/README.md b/README.md
index 91712f1bc0..6ce8f50aac 100755
--- a/README.md
+++ b/README.md
@@ -41,7 +41,9 @@ rm -rf ~/Library/Application\ Support/Kitematic
 
 Have a bug or a feature request? Please first read the [Issue Guidelines](https://github.com/kitematic/kitematic/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/kitematic/kitematic/issues/new).
 
-## Contributing
+## Roadmap & Contributing
+
+We will be accepting pull requests that help with our [roadmap](ROADMAP.md).
 
 Please read through our [Contributing Guidelines](https://github.com/kitematic/kitematic/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
 
@@ -54,4 +56,4 @@ Keep track of development and community news.
 
 ## Copyright and License
 
-Code released under the [AGPL license](LICENSE).
+Code released under the [Apache license](LICENSE).
diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 0000000000..c8b256dfdd
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,29 @@
+## Kitematic Roadmap
+
+We will be accepting pull requests that help with our roadmap.
+
+**January 2015**
+
+* Automatic update
+* Stability bug fixes
+
+**Februay 2015**
+
+* Docker machine support
+* Front-end refactor
+* Starting Unit tests
+
+**March 2015**
+
+* Kitematic re-design (container centric workflow)
+* Docker Hub pull / search for public Docker images
+
+**April 2015**
+
+* Docker Hub - sign-up/sign-in
+	* Allow users to sign-up / sign-in to Docker Hub from Kitematic.
+* Docker Hub - private repo view if user is logged-in to Docker Hub account
+
+**May / June 2015**
+
+* Microsoft Windows port