diff --git a/.travis_mysql51.sh b/.travis_mysql51.sh
index bc3da3dd6..d106b6464 100644
--- a/.travis_mysql51.sh
+++ b/.travis_mysql51.sh
@@ -5,7 +5,7 @@ set -eux
 apt-get purge -qq '^mysql*' '^libmysql*'
 rm -fr /etc/mysql
 rm -fr /var/lib/mysql
-apt-key adv --keyserver keys.gnupg.net --recv-keys 8507EFA5
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 9334A25F8507EFA5
 add-apt-repository 'deb http://repo.percona.com/apt precise main'
 apt-get update -qq
 apt-get install -qq percona-server-server-5.1 percona-server-client-5.1 libmysqlclient16-dev
diff --git a/ext/mysql2/extconf.rb b/ext/mysql2/extconf.rb
index e7ccef5ec..043d001ed 100644
--- a/ext/mysql2/extconf.rb
+++ b/ext/mysql2/extconf.rb
@@ -105,8 +105,8 @@ def add_ssl_defines(header)
   asplode 'mysql.h'
 end
 
-%w(errmsg.h mysqld_error.h).each do |h|
-  header = [prefix, h].compact.join '/'
+%w(errmsg.h).each do |h|
+  header = [prefix, h].compact.join('/')
   asplode h unless have_header header
 end
 
diff --git a/ext/mysql2/mysql2_ext.h b/ext/mysql2/mysql2_ext.h
index 3995c3698..80063ed04 100644
--- a/ext/mysql2/mysql2_ext.h
+++ b/ext/mysql2/mysql2_ext.h
@@ -12,11 +12,9 @@ void Init_mysql2(void);
 #ifdef HAVE_MYSQL_H
 #include <mysql.h>
 #include <errmsg.h>
-#include <mysqld_error.h>
 #else
 #include <mysql/mysql.h>
 #include <mysql/errmsg.h>
-#include <mysql/mysqld_error.h>
 #endif
 
 #ifdef HAVE_RUBY_ENCODING_H