diff --git a/lib/php-u2flib-server b/lib/php-u2flib-server
index 5823a6d..a87ffad 160000
--- a/lib/php-u2flib-server
+++ b/lib/php-u2flib-server
@@ -1 +1 @@
-Subproject commit 5823a6d43e07409a959c4fc58971509d7c5f162c
+Subproject commit a87ffadc4ee6040b2418847e9ca00bad2d223c6d
diff --git a/u2f-login.php b/u2f-login.php
index db0ec34..e5892b0 100644
--- a/u2f-login.php
+++ b/u2f-login.php
@@ -48,7 +48,7 @@ static function init() {
 	}
 
 	private function __construct() {
-		require_once( plugin_dir_path( __FILE__ ) . 'lib/php-u2flib-server/autoload.php');
+		require_once( plugin_dir_path( __FILE__ ) . 'lib/php-u2flib-server/src/u2flib_server/U2F.php');
 		$this->u2f = new u2flib_server\U2F( set_url_scheme('//' . $_SERVER['HTTP_HOST'] ) );
 
 		add_action('login_enqueue_scripts', array( &$this, 'login_enqueue_assets') );