diff --git a/free-podcasts-screencasts-en.md b/free-podcasts-screencasts-en.md
index 409e01ca797085390aa2310121e598397a74f27e..493415eae32042cfb0613b9058d9e4627c4e3d16 100644
--- a/free-podcasts-screencasts-en.md
+++ b/free-podcasts-screencasts-en.md
@@ -3,6 +3,7 @@
 * [Angular JS](#angularjs)
 * [Node.js](#Nodejs)
 * [CSS](#css)
+* [Elixir](#elixir)
 * [Emacs](#emacs)
 * [Erlang](#erlang)
 * [Language Agnostic](#language-agnostic)
@@ -24,6 +25,12 @@
 ### CSS
 * [Screencast] - [CSS-Tricks Screencasts](http://css-tricks.com/video-screencasts/)
 
+### Elixir
+* [Screencast] - [ElixirConf 2014](https://www.youtube.com/playlist?list=PLE7tQUdRKcyakbmyFcmznq2iNtL80mCsT)
+* [Screencast] - [ElixirConf 2015](https://www.youtube.com/playlist?list=PLWbHc_FXPo2jBXpr1IjyUgJ7hNS1eTf7H)
+* [Screencast] - [Elixir Sips](http://elixirsips.com/) - Some free
+* [Screencast] = [Intro to Elixir](https://www.youtube.com/watch?v=lly-1UYmnFI&list=PLn76XROGFNtE9InImlu6e8isbOsM7qKtt)
+
 ### Emacs
 * [Screencast] - [Emacs Rocks!](http://emacsrocks.com/)
 
diff --git a/free-programming-books.md b/free-programming-books.md
index 520db3d68721b06d05a4c1c5cac6963340d4481a..fdcca01feac22a701134b3a6152ce2c2cd99f90b 100644
--- a/free-programming-books.md
+++ b/free-programming-books.md
@@ -37,6 +37,7 @@ Original Source: [Free Programming books](http://stackoverflow.com/revisions/392
 * [Delphi / Pascal](#delphi--pascal)
 * [DTrace](#dtrace)
 * [Elasticsearch](#elasticsearch)
+* [Elixir](#elixir)
 * [Emacs](#emacs)
 * [Erlang](#erlang)
 * [F#](#f-sharp)
@@ -888,6 +889,12 @@ Original Source: [Free Programming books](http://stackoverflow.com/revisions/392
 * [Elasticsearch: The Definitive Guide](http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/index.html) ([fork it on GH](https://github.com/elasticsearch/elasticsearch-definitive-guide))
 * [Exploring Elasticsearch](http://exploringelasticsearch.com/)
 
+### Elixir
+* [30 Days of Elixir](https://github.com/seven1m/30-days-of-elixir) - Tim Morgan (HTML)
+* [Études for Elixir](http://chimera.labs.oreilly.com/books/1234000001642/index.html) (HTML)
+* [Getting Started Guide](http://elixir-lang.org/getting-started/introduction.html) (HTML)
+* [Learning Elixir](http://learningelixir.joekain.com/) - Joseph Kain Blog (HTML)
+
 
 ### Emacs
 * [An Introduction to Programming in Emacs Lisp, 3rd Edition](https://www.gnu.org/software/emacs/manual/html_node/eintr/index.html)