diff --git a/bitcoin_script.c b/bitcoin_script.c
index 682666306..26fbb42ff 100644
--- a/bitcoin_script.c
+++ b/bitcoin_script.c
@@ -154,13 +154,13 @@ u8 *scriptpubkey_pay_to_pubkeyhash(const tal_t *ctx,
 }
 
 u8 *scriptsig_pay_to_pubkeyhash(const tal_t *ctx,
-				const struct bitcoin_address *addr,
+				const struct pubkey *key,
 				const struct signature *sig)
 {
 	u8 *script = tal_arr(ctx, u8, 0);
 
 	add_push_sig(&script, sig);
-	add_push_bytes(&script, addr, sizeof(*addr));
+	add_push_key(&script, key);
 
 	return script;
 }
diff --git a/bitcoin_script.h b/bitcoin_script.h
index fe3232eb8..2f1175761 100644
--- a/bitcoin_script.h
+++ b/bitcoin_script.h
@@ -35,7 +35,7 @@ u8 *scriptpubkey_pay_to_pubkeyhash(const tal_t *ctx,
 
 /* Create an input script to accept pay to pubkey */
 u8 *scriptsig_pay_to_pubkeyhash(const tal_t *ctx,
-				const struct bitcoin_address *addr,
+				const struct pubkey *key,
 				const struct signature *sig);
 
 /* Create an input script to accept pay to pubkey */
diff --git a/open-anchor-scriptsigs.c b/open-anchor-scriptsigs.c
index 5bb64535a..76a7fa0ab 100644
--- a/open-anchor-scriptsigs.c
+++ b/open-anchor-scriptsigs.c
@@ -27,7 +27,6 @@ static u8 *tx_scriptsig(const tal_t *ctx,
 			const struct pubkey *pubkey)
 {
 	struct signature *sig;
-	struct bitcoin_address addr;
 
 	sig = sign_tx_input(ctx, tx, i,
 			    input->subscript.data, input->subscript.len,
@@ -37,8 +36,7 @@ static u8 *tx_scriptsig(const tal_t *ctx,
 
 	if (!is_pay_to_pubkey_hash(input->subscript.data, input->subscript.len))
 		errx(1, "FIXME: Don't know how to handle input");
-	bitcoin_address(pubkey, &addr);
-	return scriptsig_pay_to_pubkeyhash(ctx, &addr, sig);
+	return scriptsig_pay_to_pubkeyhash(ctx, pubkey, sig);
 }
 	
 int main(int argc, char *argv[])