diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py
index 460e4f93535..4e9e5dbd3c3 100644
--- a/lib/ansible/playbook/__init__.py
+++ b/lib/ansible/playbook/__init__.py
@@ -114,6 +114,8 @@ class PlayBook(object):
         self.basedir    = os.path.dirname(playbook)
         self.playbook  = utils.parse_yaml_from_file(playbook)
 
+        self.module_path = self.module_path + os.pathsep + os.path.join(self.basedir, "library")
+
     # *****************************************************
         
     def run(self):