diff --git a/LICENSE b/LICENSE
deleted file mode 120000
index ac135a01f..000000000
--- a/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-ccan/licenses/BSD-MIT
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..582800a0a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+Note: the modules in the ccan/ directory have their own licenses, but
+the rest of the code is covered by the following (BSD-MIT) license:
+
+	Copyright Rusty Russell (Blockstream) 2015.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Makefile b/Makefile
index 326ede9d1..c3fdedbcc 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,8 @@ CCAN_OBJS :=					\
 	ccan-crypto-sha256.o			\
 	ccan-crypto-shachain.o			\
 	ccan-err.o				\
+	ccan-hash.o				\
+	ccan-htable.o				\
 	ccan-ilog.o				\
 	ccan-io-io.o				\
 	ccan-io-poll.o				\
@@ -92,11 +94,6 @@ CCAN_OBJS :=					\
 	ccan-time.o				\
 	ccan-timer.o
 
-# For tests
-CCAN_EXTRA_OBJS :=				\
-	ccan-hash.o				\
-	ccan-htable.o
-
 CCAN_HEADERS :=						\
 	$(CCANDIR)/config.h				\
 	$(CCANDIR)/ccan/alignof/alignof.h		\
@@ -195,7 +192,7 @@ $(PROGRAMS): CFLAGS+=-I.
 default: $(PROGRAMS)
 
 # Everything depends on the CCAN headers.
-$(CCAN_OBJS) $(CCAN_EXTRA_OBJS) $(CDUMP_OBJS) $(HELPER_OBJS) $(BITCOIN_OBJS) $(TEST_CLI_PROGRAMS:=.o) $(TEST_PROGRAMS:=.o): $(CCAN_HEADERS)
+$(CCAN_OBJS) $(CDUMP_OBJS) $(HELPER_OBJS) $(BITCOIN_OBJS) $(TEST_CLI_PROGRAMS:=.o) $(TEST_PROGRAMS:=.o): $(CCAN_HEADERS)
 
 # Except for CCAN, everything depends on bitcoin/ and core headers.
 $(HELPER_OBJS) $(BITCOIN_OBJS) $(TEST_CLI_PROGRAMS:=.o) $(TEST_PROGRAMS:=.o): $(BITCOIN_HEADERS) $(CORE_HEADERS) $(GEN_HEADERS)
@@ -268,7 +265,7 @@ lightning.pb-c.c lightning.pb-c.h: lightning.proto
 	$(PROTOCC) lightning.proto --c_out=.
 
 $(TEST_CLI_PROGRAMS): % : %.o $(CORE_OBJS) $(BITCOIN_OBJS) $(CCAN_OBJS) $(TEST_CLI_OBJS) libsecp256k1.a
-$(TEST_PROGRAMS): % : %.o $(BITCOIN_OBJS) $(CCAN_OBJS) $(CCAN_EXTRA_OBJS) version.o libsecp256k1.a
+$(TEST_PROGRAMS): % : %.o $(BITCOIN_OBJS) $(CCAN_OBJS) version.o libsecp256k1.a
 
 ccan/config.h: ccan/tools/configurator/configurator
 	$< > $@
@@ -326,7 +323,7 @@ clean:
 	$(MAKE) -C secp256k1/ clean || true
 	$(RM) libsecp256k1.{a,la}
 	$(RM) $(PROGRAMS) test-cli/leak-anchor-sigs
-	$(RM) bitcoin/*.o *.o $(PROGRAMS:=.o) $(CCAN_OBJS) $(CCAN_EXTRA_OBJS)
+	$(RM) bitcoin/*.o *.o $(PROGRAMS:=.o) $(CCAN_OBJS)
 	$(RM) doc/deployable-lightning.{aux,bbl,blg,dvi,log,out,tex}
 
 ccan-tal.o: $(CCANDIR)/ccan/tal/tal.c