diff --git a/free-programming-books.md b/free-programming-books.md
index 47a8c48d6..3da4afe04 100644
--- a/free-programming-books.md
+++ b/free-programming-books.md
@@ -1190,6 +1190,8 @@ See also [TeX](#tex)
 * [Welcome to Problem Solving with Algorithms and Data Structures](http://interactivepython.org/runestone/static/pythonds/index.html) - Brad Miller and David Ranum
 * [Python in Hydrology](http://www.greenteapress.com/pythonhydro/pythonhydro.html) - Sat Kumar Tomer
 * [Introduction to python](http://kracekumar.com/post/71171551647/introduction-to-python) - Kracekumar
+* [Web2py: Complete Reference Manual, 6th Edition (pre-release)](http://web2py.com/book) - HTML
+* [Web2py: Complete Reference Manual, 6th Edition (pre-release)](https://dl.dropbox.com/u/18065445/web2py/web2py_manual_5th.pdf) - PDF
 
 ####Django
 * [Djen of Django](http://agiliq.com/books/djenofdjango/)