diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 353010f..061d9cd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,7 @@
 ## Got a question or problem?
 
+Firstly, please go over our FAQ: https://github.com/angular-ui/bootstrap/wiki/FAQ
+
 Please, do not open issues for the general support questions as we want to keep GitHub issues for bug reports and feature requests. You've got much better chances of getting your question answered on [StackOverflow](http://stackoverflow.com/questions/tagged/angular-ui-bootstrap) where maintainers are looking at questions questions tagged with `angular-ui-bootstrap`.
 
 StackOverflow is a much better place to ask questions since:
diff --git a/README.md b/README.md
index c5dbf24..df2ee97 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,10 @@ Project files are also available through your favourite package manager:
 * **Bower**: `bower install angular-bootstrap`
 * **NuGet**: https://nuget.org/packages/Angular.UI.Bootstrap/
 
+## FAQ
+
+https://github.com/angular-ui/bootstrap/wiki/FAQ
+
 ## Supported browsers
 
 Directives from this repository are automatically tested with the following browsers:
diff --git a/misc/demo/index.html b/misc/demo/index.html
index c1891f4..7a5cd9c 100644
--- a/misc/demo/index.html
+++ b/misc/demo/index.html
@@ -169,6 +169,8 @@
                     <p>Original Bootstrap's CSS depends on empty <code>href</code> attributes to style cursors for several components (pagination, tabs etc.).
                     But in AngularJS adding empty <code>href</code> attributes to link tags will cause unwanted route changes. This is why we need to remove empty <code>href</code> attributes from directive templates and as a result styling is not applied correctly. The remedy is simple, just add the following styling to your application: <pre><code>.nav, .pagination, .carousel, .panel-title a { cursor: pointer; }</code></pre>
                     </p>
+                    <h3>FAQ</h3>
+                    <p>Please check <a href="https://github.com/angular-ui/bootstrap/wiki/FAQ" target="_blank">our FAQ section</a> for common problems / solutions.</p>
                 </section>
                 <% demoModules.forEach(function(module) { %>
                     <section id="<%= module.name %>">