diff --git a/Makefile b/Makefile
index 33835a7aa..b9bc1124a 100644
--- a/Makefile
+++ b/Makefile
@@ -814,13 +814,10 @@ OBJS = src/mux_h2.o src/stream.o src/mux_fcgi.o src/cfgparse-listen.o         \
        src/pipe.o src/shctx.o src/hpack-tbl.o src/http_acl.o src/sha1.o       \
        src/time.o src/hpack-enc.o src/fcgi.o src/arg.o src/base64.o           \
        src/protocol.o src/freq_ctr.o src/lru.o src/hpack-huff.o src/dict.o    \
+       src/eb32sctree.o src/eb32tree.o src/eb64tree.o src/ebmbtree.o          \
+       src/ebsttree.o src/ebimtree.o src/ebistree.o src/ebtree.o              \
        src/hash.o src/mailers.o src/version.o
 
-EBTREE_OBJS = $(EBTREE_DIR)/ebtree.o $(EBTREE_DIR)/eb32sctree.o \
-              $(EBTREE_DIR)/eb32tree.o $(EBTREE_DIR)/eb64tree.o \
-              $(EBTREE_DIR)/ebmbtree.o $(EBTREE_DIR)/ebsttree.o \
-              $(EBTREE_DIR)/ebimtree.o $(EBTREE_DIR)/ebistree.o
-
 ifneq ($(TRACE),)
 OBJS += src/calltrace.o
 endif
@@ -829,9 +826,6 @@ ifneq ($(EXTRA_OBJS),)
 OBJS += $(EXTRA_OBJS)
 endif
 
-# Not used right now
-LIB_EBTREE = $(EBTREE_DIR)/libebtree.a
-
 # Used only for forced dependency checking. May be cleared during development.
 INCLUDES = $(wildcard include/*/*.h ebtree/*.h)
 DEP = $(INCLUDES) .build_opts
@@ -864,12 +858,9 @@ else
 .build_opts:
 endif
 
-haproxy: $(OPTIONS_OBJS) $(OBJS) $(EBTREE_OBJS)
+haproxy: $(OPTIONS_OBJS) $(OBJS)
 	$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)
 
-$(LIB_EBTREE): $(EBTREE_OBJS)
-	$(cmd_AR) rv $@ $^
-
 objsize: haproxy
 	$(Q)objdump -t $^|grep ' g '|grep -F '.text'|awk '{print $$5 FS $$6}'|sort
 
@@ -927,7 +918,7 @@ uninstall:
 	$(Q)rm -f "$(DESTDIR)$(SBINDIR)"/haproxy
 
 clean:
-	$(Q)rm -f *.[oas] src/*.[oas] ebtree/*.[oas] haproxy test .build_opts .build_opts.new
+	$(Q)rm -f *.[oas] src/*.[oas] haproxy test .build_opts .build_opts.new
 	$(Q)for dir in . src include/* doc ebtree; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done
 	$(Q)rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)$(SUBVERS).tar.gz
 	$(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS) nohup.out gmon.out
diff --git a/contrib/halog/Makefile b/contrib/halog/Makefile
index 5e687c09a..319942d11 100644
--- a/contrib/halog/Makefile
+++ b/contrib/halog/Makefile
@@ -1,5 +1,6 @@
 EBTREE_DIR = ../../ebtree
 INCLUDE  = -I../../include -I$(EBTREE_DIR)
+SRC      = ../../src
 
 CC       = gcc
 
@@ -16,7 +17,7 @@ DEFINE   =
 OBJS     = halog
 
 halog: halog.c fgets2.c
-	$(CC) $(OPTIMIZE) $(DEFINE) -o $@ $(INCLUDE) $(EBTREE_DIR)/ebtree.c $(EBTREE_DIR)/eb32tree.c $(EBTREE_DIR)/eb64tree.c $(EBTREE_DIR)/ebmbtree.c $(EBTREE_DIR)/ebsttree.c $(EBTREE_DIR)/ebistree.c $(EBTREE_DIR)/ebimtree.c $^
+	$(CC) $(OPTIMIZE) $(DEFINE) -o $@ $(INCLUDE) $(SRC)/ebtree.c $(SRC)/eb32tree.c $(SRC)/eb64tree.c $(SRC)/ebmbtree.c $(SRC)/ebsttree.c $(SRC)/ebistree.c $(SRC)/ebimtree.c $^
 
 clean:
 	rm -f $(OBJS) *.[oas]
diff --git a/ebtree/eb32sctree.c b/src/eb32sctree.c
similarity index 100%
rename from ebtree/eb32sctree.c
rename to src/eb32sctree.c
diff --git a/ebtree/eb32tree.c b/src/eb32tree.c
similarity index 100%
rename from ebtree/eb32tree.c
rename to src/eb32tree.c
diff --git a/ebtree/eb64tree.c b/src/eb64tree.c
similarity index 100%
rename from ebtree/eb64tree.c
rename to src/eb64tree.c
diff --git a/ebtree/ebimtree.c b/src/ebimtree.c
similarity index 100%
rename from ebtree/ebimtree.c
rename to src/ebimtree.c
diff --git a/ebtree/ebistree.c b/src/ebistree.c
similarity index 100%
rename from ebtree/ebistree.c
rename to src/ebistree.c
diff --git a/ebtree/ebmbtree.c b/src/ebmbtree.c
similarity index 100%
rename from ebtree/ebmbtree.c
rename to src/ebmbtree.c
diff --git a/ebtree/ebpttree.c b/src/ebpttree.c
similarity index 100%
rename from ebtree/ebpttree.c
rename to src/ebpttree.c
diff --git a/ebtree/ebsttree.c b/src/ebsttree.c
similarity index 100%
rename from ebtree/ebsttree.c
rename to src/ebsttree.c
diff --git a/ebtree/ebtree.c b/src/ebtree.c
similarity index 100%
rename from ebtree/ebtree.c
rename to src/ebtree.c