diff --git a/common/Makefile b/common/Makefile
index de27d5c8f..82a82f04a 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -1,4 +1,5 @@
 COMMON_SRC :=					\
+	common/bech32.c				\
 	common/bip32.c				\
 	common/channel_config.c			\
 	common/close_tx.c			\
diff --git a/lightningd/bech32.c b/common/bech32.c
similarity index 100%
rename from lightningd/bech32.c
rename to common/bech32.c
diff --git a/lightningd/bech32.h b/common/bech32.h
similarity index 100%
rename from lightningd/bech32.h
rename to common/bech32.h
diff --git a/lightningd/Makefile b/lightningd/Makefile
index 5aaade82c..f150a4f8d 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -14,6 +14,7 @@ default: lightningd-all
 
 # Common source we use.
 LIGHTNINGD_COMMON_OBJS :=			\
+	common/bech32.o				\
 	common/bip32.o				\
 	common/channel_config.o			\
 	common/configdir.o			\
@@ -40,7 +41,6 @@ LIGHTNINGD_COMMON_OBJS :=			\
 	common/withdraw_tx.o
 
 LIGHTNINGD_SRC :=				\
-	lightningd/bech32.c			\
 	lightningd/bitcoind.c			\
 	lightningd/bolt11.c			\
 	lightningd/build_utxos.c		\
diff --git a/lightningd/bolt11.c b/lightningd/bolt11.c
index aab05e09f..e73eac657 100644
--- a/lightningd/bolt11.c
+++ b/lightningd/bolt11.c
@@ -7,11 +7,11 @@
 #include <ccan/endian/endian.h>
 #include <ccan/structeq/structeq.h>
 #include <ccan/tal/str/str.h>
+#include <common/bech32.h>
 #include <common/utils.h>
 #include <errno.h>
 #include <hsmd/gen_hsm_wire.h>
 #include <inttypes.h>
-#include <lightningd/bech32.h>
 #include <lightningd/bolt11.h>
 #include <lightningd/hsm_control.h>
 #include <lightningd/jsonrpc.h>