13 files changed, 44 insertions, 23 deletions
diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt
index 7c38b027e..f66294c5d 100644
--- a/src/pubkey/dh/info.txt
+++ b/src/pubkey/dh/info.txt
@@ -19,4 +19,5 @@ bigint
 dl_algo
 numbertheory
 pubkey
+pk_lookup
 </requires>
diff --git a/src/pubkey/dlies/info.txt b/src/pubkey/dlies/info.txt
index 1a09dcbc5..a44b40f11 100644
--- a/src/pubkey/dlies/info.txt
+++ b/src/pubkey/dlies/info.txt
@@ -13,4 +13,5 @@ dlies.h
 dh
 kdf2
 pubkey
+pk_lookup
 </requires>
diff --git a/src/pubkey/elgamal/info.txt b/src/pubkey/elgamal/info.txt
index 6359efafa..9ca94e3e9 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/src/pubkey/elgamal/info.txt
@@ -4,15 +4,6 @@ define ELGAMAL
 
 load_on auto
 
-<add>
-elgamal.cpp
-elgamal.h
-elg_core.cpp
-elg_core.h
-elg_op.cpp
-elg_op.h
-</add>
-
 <requires>
 asn1
 bigint
@@ -20,5 +11,15 @@ bigint
 dl_algo
 keypair
 numbertheory
+pk_lookup
 pubkey
 </requires>
+
+<add>
+elgamal.cpp
+elgamal.h
+elg_core.cpp
+elg_core.h
+elg_op.cpp
+elg_op.h
+</add>
diff --git a/src/pubkey/keypair/info.txt b/src/pubkey/keypair/info.txt
index c6fa4af5d..74a0c037d 100644
--- a/src/pubkey/keypair/info.txt
+++ b/src/pubkey/keypair/info.txt
@@ -11,4 +11,5 @@ keypair.h
 
 <requires>
 pubkey
+pk_lookup
 </requires>
diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt
index 6434d4385..98d1100a0 100644
--- a/src/pubkey/nr/info.txt
+++ b/src/pubkey/nr/info.txt
@@ -19,5 +19,6 @@ bigint
 dl_algo
 keypair
 numbertheory
+pk_lookup
 pubkey
 </requires>
diff --git a/src/pubkey/pk_lookup/info.txt b/src/pubkey/pk_lookup/info.txt
new file mode 100644
index 000000000..39dd4dfc2
--- /dev/null
+++ b/src/pubkey/pk_lookup/info.txt
@@ -0,0 +1,18 @@
+realname "Public Key Lookup"
+
+define PUBLIC_KEY_LOOKUP
+
+load_on dep
+
+<requires>
+asn1
+bigint
+numbertheory
+</requires>
+
+<add>
+look_pk.cpp
+look_pk.h
+pk_algs.cpp
+pk_algs.h
+</add>
diff --git a/src/pubkey/pubkey/look_pk.cpp b/src/pubkey/pk_lookup/look_pk.cpp
index a4062b57c..a4062b57c 100644
--- a/src/pubkey/pubkey/look_pk.cpp
+++ b/src/pubkey/pk_lookup/look_pk.cpp
diff --git a/src/pubkey/pubkey/look_pk.h b/src/pubkey/pk_lookup/look_pk.h
index 28a56f2b3..28a56f2b3 100644
--- a/src/pubkey/pubkey/look_pk.h
+++ b/src/pubkey/pk_lookup/look_pk.h
diff --git a/src/pubkey/pubkey/pk_algs.cpp b/src/pubkey/pk_lookup/pk_algs.cpp
index c1fc569a0..c1fc569a0 100644
--- a/src/pubkey/pubkey/pk_algs.cpp
+++ b/src/pubkey/pk_lookup/pk_algs.cpp
diff --git a/src/pubkey/pubkey/pk_algs.h b/src/pubkey/pk_lookup/pk_algs.h
index a8fa5f176..a8fa5f176 100644
--- a/src/pubkey/pubkey/pk_algs.h
+++ b/src/pubkey/pk_lookup/pk_algs.h
diff --git a/src/pubkey/pubkey/info.txt b/src/pubkey/pubkey/info.txt
index 07fe1589f..38898cb8f 100644
--- a/src/pubkey/pubkey/info.txt
+++ b/src/pubkey/pubkey/info.txt
@@ -12,10 +12,6 @@ pbe_base
 </requires>
 
 <add>
-look_pk.cpp
-look_pk.h
-pk_algs.cpp
-pk_algs.h
 pk_keys.cpp
 pk_keys.h
 pkcs8.cpp
diff --git a/src/pubkey/rsa/info.txt b/src/pubkey/rsa/info.txt
index b9f7df3ae..378457e2a 100644
--- a/src/pubkey/rsa/info.txt
+++ b/src/pubkey/rsa/info.txt
@@ -4,16 +4,17 @@ define RSA
 
 load_on auto
 
-<add>
-rsa.cpp
-rsa.h
-</add>
-
 <requires>
 asn1
 bigint
 if_algo
 keypair
 numbertheory
+pk_lookup
 pubkey
 </requires>
+
+<add>
+rsa.cpp
+rsa.h
+</add>
diff --git a/src/pubkey/rw/info.txt b/src/pubkey/rw/info.txt
index ab43ebbf4..7a29bd568 100644
--- a/src/pubkey/rw/info.txt
+++ b/src/pubkey/rw/info.txt
@@ -4,16 +4,17 @@ define RW
 
 load_on auto
 
-<add>
-rw.cpp
-rw.h
-</add>
-
 <requires>
 asn1
 bigint
 if_algo
 keypair
 numbertheory
+pk_lookup
 pubkey
 </requires>
+
+<add>
+rw.cpp
+rw.h
+</add>