diff -Naur MediaWiki-OpenID-0.9.0.orig/DatabaseConnection.php MediaWiki-OpenID-0.9.0.new/DatabaseConnection.php
--- MediaWiki-OpenID-0.9.0.orig/DatabaseConnection.php	2010-07-28 03:08:10.000000000 -0600
+++ MediaWiki-OpenID-0.9.0.new/DatabaseConnection.php	2011-06-11 23:52:35.000000000 -0600
@@ -1,6 +1,6 @@
 <?php
 
-require_once( 'Auth/OpenID/DatabaseConnection.php' );
+require_once( 'Auth_OpenID/OpenID/DatabaseConnection.php' );
 require_once( 'PEAR.php' );
 
 class MediaWikiOpenIDDatabaseConnection extends Auth_OpenID_DatabaseConnection {
diff -Naur MediaWiki-OpenID-0.9.0.orig/MemcachedStore.php MediaWiki-OpenID-0.9.0.new/MemcachedStore.php
--- MediaWiki-OpenID-0.9.0.orig/MemcachedStore.php	2010-07-28 03:08:10.000000000 -0600
+++ MediaWiki-OpenID-0.9.0.new/MemcachedStore.php	2011-06-11 23:52:35.000000000 -0600
@@ -1,6 +1,6 @@
 <?php
 
-require_once( 'Auth/OpenID/MemcachedStore.php' );
+require_once( 'Auth_OpenID/OpenID/MemcachedStore.php' );
 
 class MediaWikiOpenIDMemcachedStore extends Auth_OpenID_MemcachedStore {
 
diff -Naur MediaWiki-OpenID-0.9.0.orig/OpenID.setup.php MediaWiki-OpenID-0.9.0.new/OpenID.setup.php
--- MediaWiki-OpenID-0.9.0.orig/OpenID.setup.php	2010-07-28 03:08:09.000000000 -0600
+++ MediaWiki-OpenID-0.9.0.new/OpenID.setup.php	2011-06-11 23:52:35.000000000 -0600
@@ -168,7 +168,7 @@
 );
 
 function OpenIDGetServerPath() {
-	$rel = 'Auth/OpenID/Server.php';
+	$rel = 'Auth_OpenID/OpenID/Server.php';
 
 	foreach ( explode( PATH_SEPARATOR, get_include_path() ) as $pe ) {
 		$full = $pe . DIRECTORY_SEPARATOR . $rel;
diff -Naur MediaWiki-OpenID-0.9.0.orig/SpecialOpenID.body.php MediaWiki-OpenID-0.9.0.new/SpecialOpenID.body.php
--- MediaWiki-OpenID-0.9.0.orig/SpecialOpenID.body.php	2010-07-28 03:08:08.000000000 -0600
+++ MediaWiki-OpenID-0.9.0.new/SpecialOpenID.body.php	2011-06-11 23:52:35.000000000 -0600
@@ -25,10 +25,10 @@
 # FIXME: for login(); figure out better way to share this code
 # between Login and Convert
 
-require_once( "Auth/OpenID/Consumer.php" );
-require_once( "Auth/OpenID/SReg.php" );
-require_once( "Auth/OpenID/AX.php" );
-require_once( "Auth/OpenID/FileStore.php" );
+require_once( "Auth_OpenID/OpenID/Consumer.php" );
+require_once( "Auth_OpenID/OpenID/SReg.php" );
+require_once( "Auth_OpenID/OpenID/AX.php" );
+require_once( "Auth_OpenID/OpenID/FileStore.php" );
 
 class SpecialOpenID extends SpecialPage {
 
@@ -50,17 +50,17 @@
 		case 'db':
 			if ( $wgDBtype == 'sqlite' ) {
 				$db = new MediaWikiOpenIDDatabaseConnection( wfGetDB( DB_MASTER ) );
-				require_once( 'Auth/OpenID/SQLiteStore.php' );
+				require_once( 'Auth_OpenID/OpenID/SQLiteStore.php' );
 				return new Auth_OpenID_SQLiteStore( $db );
 			} else {
 				$lb = wfGetLBFactory()->newMainLB();
 				$db = new MediaWikiOpenIDDatabaseConnection( $lb->getConnection( DB_MASTER ) );
 				switch( $wgDBtype ) {
 				case 'mysql':
-					require_once( 'Auth/OpenID/MySQLStore.php' );
+					require_once( 'Auth_OpenID/OpenID/MySQLStore.php' );
 					return new Auth_OpenID_MySQLStore( $db );
 				case 'postgres':
-					require_once( 'Auth/OpenID/PostgreSQLStore.php' );
+					require_once( 'Auth_OpenID/OpenID/PostgreSQLStore.php' );
 					return new Auth_OpenID_PostgreSQLStore( $db );
 				default:
 					$wgOut->showErrorPage( 'openidconfigerror', 'openidconfigerrortext' );
diff -Naur MediaWiki-OpenID-0.9.0.orig/SpecialOpenIDLogin.body.php MediaWiki-OpenID-0.9.0.new/SpecialOpenIDLogin.body.php
--- MediaWiki-OpenID-0.9.0.orig/SpecialOpenIDLogin.body.php	2010-07-28 03:08:07.000000000 -0600
+++ MediaWiki-OpenID-0.9.0.new/SpecialOpenIDLogin.body.php	2011-06-11 23:55:36.000000000 -0600
@@ -25,7 +25,7 @@
 if ( !defined( 'MEDIAWIKI' ) )
   exit( 1 );
 
-require_once( "Auth/Yadis/XRI.php" );
+require_once( "Auth_OpenID/Yadis/XRI.php" );
 
 class SpecialOpenIDLogin extends SpecialOpenID {
 
diff -Naur MediaWiki-OpenID-0.9.0.orig/SpecialOpenIDServer.body.php MediaWiki-OpenID-0.9.0.new/SpecialOpenIDServer.body.php
--- MediaWiki-OpenID-0.9.0.orig/SpecialOpenIDServer.body.php	2010-07-28 03:08:07.000000000 -0600
+++ MediaWiki-OpenID-0.9.0.new/SpecialOpenIDServer.body.php	2011-06-11 23:52:35.000000000 -0600
@@ -25,8 +25,8 @@
 if ( !defined( 'MEDIAWIKI' ) )
   exit( 1 );
 
-require_once( "Auth/OpenID/Server.php" );
-require_once( "Auth/OpenID/Consumer.php" );
+require_once( "Auth_OpenID/OpenID/Server.php" );
+require_once( "Auth_OpenID/OpenID/Consumer.php" );
 
 # Special page for the server side of OpenID
 # It has three major flavors: