diff --git a/modules/openid/www/consumer.php b/modules/openid/www/consumer.php
index 9676704c1c68e69e0fe4e7e8542926f013f64a12..22291c1abe294ef237c01381ca565a99a4d80788 100644
--- a/modules/openid/www/consumer.php
+++ b/modules/openid/www/consumer.php
@@ -6,6 +6,9 @@
  */
 SimpleSAML_Utilities::maskErrors(E_STRICT);
 
+/* Add the OpenID library search path. */
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(dirname(dirname(dirname(__FILE__)))) . '/lib');
+
 require_once('Auth/OpenID/SReg.php');
 require_once('Auth/OpenID/Server.php');
 require_once('Auth/OpenID/ServerRequest.php');
diff --git a/modules/openidProvider/lib/Server.php b/modules/openidProvider/lib/Server.php
index 62b2ab7bae2039b25377ad3928048fafdd1dc062..874bb514fc8da15daea75272d60ee04ec32da5f5 100644
--- a/modules/openidProvider/lib/Server.php
+++ b/modules/openidProvider/lib/Server.php
@@ -1,5 +1,8 @@
 <?php
 
+/* Add the OpenID library search path. */
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(dirname(dirname(dirname(__FILE__)))) . '/lib');
+
 /**
  * Helper class for the OpenID provider code.
  *