Index: otp/lib/public_key/src/Makefile
===================================================================
--- otp.orig/lib/public_key/src/Makefile	2011-12-17 18:41:03.000000000 +0200
+++ otp/lib/public_key/src/Makefile	2011-12-17 18:44:52.000000000 +0200
@@ -71,7 +71,7 @@
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-PUB_KEY_ERL_FLAGS += -I $(INCLUDE) -I ../asn1/
+PUB_KEY_ERL_FLAGS += -pa $(ERL_TOP)/lib/public_key/ebin -I ../asn1/
 
 ERL_COMPILE_FLAGS += $(PUB_KEY_ERL_FLAGS) \
 		     $(PUB_KEY_FLAGS) \
Index: otp/lib/public_key/src/pubkey_cert.erl
===================================================================
--- otp.orig/lib/public_key/src/pubkey_cert.erl	2011-12-17 18:41:03.000000000 +0200
+++ otp/lib/public_key/src/pubkey_cert.erl	2011-12-17 18:44:52.000000000 +0200
@@ -21,7 +21,7 @@
 
 -module(pubkey_cert).
 
--include("public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -export([init_validation_state/3, prepare_for_next_cert/2,
  	 validate_time/3, validate_signature/6,
Index: otp/lib/public_key/src/pubkey_cert_records.erl
===================================================================
--- otp.orig/lib/public_key/src/pubkey_cert_records.erl	2011-12-17 18:41:03.000000000 +0200
+++ otp/lib/public_key/src/pubkey_cert_records.erl	2011-12-17 18:44:52.000000000 +0200
@@ -21,7 +21,7 @@
 
 -module(pubkey_cert_records).
 
--include("public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -export([decode_cert/1, transform/2, supportedPublicKeyAlgorithms/1]).
 
Index: otp/lib/public_key/src/pubkey_pbe.erl
===================================================================
--- otp.orig/lib/public_key/src/pubkey_pbe.erl	2011-12-17 18:41:03.000000000 +0200
+++ otp/lib/public_key/src/pubkey_pbe.erl	2011-12-17 18:44:52.000000000 +0200
@@ -20,7 +20,7 @@
 
 -module(pubkey_pbe).
 
--include("public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -export([encode/4, decode/4, decrypt_parameters/1]). 
 -export([pbdkdf1/4, pbdkdf2/6]).
Index: otp/lib/public_key/src/pubkey_pem.erl
===================================================================
--- otp.orig/lib/public_key/src/pubkey_pem.erl	2011-12-17 18:41:03.000000000 +0200
+++ otp/lib/public_key/src/pubkey_pem.erl	2011-12-17 18:44:52.000000000 +0200
@@ -40,7 +40,7 @@
 
 -module(pubkey_pem).
 
--include("public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -export([encode/1, decode/1, decipher/2, cipher/3]).
 
Index: otp/lib/public_key/src/pubkey_ssh.erl
===================================================================
--- otp.orig/lib/public_key/src/pubkey_ssh.erl	2011-12-17 18:41:03.000000000 +0200
+++ otp/lib/public_key/src/pubkey_ssh.erl	2011-12-17 18:44:52.000000000 +0200
@@ -18,7 +18,7 @@
 %%
 -module(pubkey_ssh).
 
--include("public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -export([decode/2, encode/2]).
 
Index: otp/lib/public_key/src/public_key.erl
===================================================================
--- otp.orig/lib/public_key/src/public_key.erl	2011-12-17 18:41:03.000000000 +0200
+++ otp/lib/public_key/src/public_key.erl	2011-12-17 18:44:52.000000000 +0200
@@ -21,7 +21,7 @@
 
 -module(public_key).
 
--include("public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -export([pem_decode/1, pem_encode/1, 
 	 der_decode/2, der_encode/2,