From f8796c261b86ef5cd8394511bf421d6a467ff2d5 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 11 Apr 2016 16:35:29 +0930
Subject: [PATCH] Make BIP68 and CSV support the default.

This has gone upstream into bitcoind, so enable it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2952da297..8e40d5a4d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@ CCANDIR := ccan
 
 # Bitcoin uses DER for signatures (Add BIP68 & HAS_CSV if it's supported)
 BITCOIN_FEATURES :=				\
-	-DHAS_BIP68=0				\
+	-DHAS_BIP68=1				\
 	-DHAS_CLTV=1				\
-	-DHAS_CSV=0				\
+	-DHAS_CSV=1				\
 	-DSCRIPTS_USE_DER=1
 
 FEATURES := $(BITCOIN_FEATURES)