diff --git a/Makefile b/Makefile
index 3bdffbb4..bbe08c0b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ else
 UNUSED:=$(shell $(MAKE) loglevels.h)
 endif
 
-SUBDIRS=i3-msg i3-input i3-nagbar i3-config-wizard
+SUBDIRS=i3-msg i3-input i3-nagbar i3-config-wizard i3bar
 
 # Depend on the specific file (.c for each .o) and on all headers
 src/%.o: src/%.c ${HEADERS}
diff --git a/common.mk b/common.mk
index 0a695e7d..d7c0c5ac 100644
--- a/common.mk
+++ b/common.mk
@@ -93,7 +93,7 @@ endif
 
 # Fallback for libyajl 1 which did not include yajl_version.h. We need
 # YAJL_MAJOR from that file to decide which code path should be used.
-CFLAGS += -idirafter yajl-fallback
+CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
 
 ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
 CPPFLAGS += -D_GNU_SOURCE
diff --git a/i3bar/Makefile b/i3bar/Makefile
index 216e68cc..643065df 100644
--- a/i3bar/Makefile
+++ b/i3bar/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=$(shell pwd)
+TOPDIR=..
 
 include $(TOPDIR)/common.mk
 
@@ -6,11 +6,13 @@ FILES:=$(wildcard src/*.c)
 FILES:=$(FILES:.c=.o)
 HEADERS:=$(wildcard include/*.h)
 
+CPPFLAGS += -I$(TOPDIR)/include
+
 all: i3bar doc
 
 i3bar: ${FILES}
 	echo "LINK"
-	$(CC) -o i3bar ${FILES} ${LDFLAGS}
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 doc:
 	echo ""
diff --git a/i3bar/common.mk b/i3bar/common.mk
deleted file mode 100644
index ec633007..00000000
--- a/i3bar/common.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-INSTALL=install
-ifndef DEBUG
-DEBUG=1
-endif
-PREFIX=/usr
-
-# The escaping is absurd, but we need to escape for shell, sed, make, define
-GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch $(shell [ -f .git/HEAD ] && sed 's/ref: refs\/heads\/\(.*\)/\\\\\\"\1\\\\\\"/g' .git/HEAD || echo 'unknown'))"
-
-# Fallback for libyajl 1 which did not include yajl_version.h. We need
-# YAJL_MAJOR from that file to decide which code path should be used.
-CFLAGS += -idirafter yajl-fallback
-
-CFLAGS += -Wall
-CFLAGS += -pipe
-CFLAGS += -g
-
-CPPFLAGS += -DI3BAR_VERSION=\"${GIT_VERSION}\"
-CPPFLAGS += -Iinclude
-
-LDFLAGS += -lev
-LDFLAGS += -lyajl
-LDFLAGS += -lxcb
-LDFLAGS += -lX11
-LDFLAGS += -L/usr/local/lib
-
-ifeq ($(DEBUG),1)
-CFLAGS += -g3
-else
-CFLAGS += -O2
-endif
-
-.SILENT:
-
-.PHONY: install clean
diff --git a/i3bar/src/main.c b/i3bar/src/main.c
index e91511ef..0def3057 100644
--- a/i3bar/src/main.c
+++ b/i3bar/src/main.c
@@ -184,7 +184,7 @@ int main(int argc, char **argv) {
                 config.disable_ws = 1;
                 break;
             case 'v':
-                printf("i3bar version " I3BAR_VERSION " © 2010-2011 Axel Wagner and contributors\n");
+                printf("i3bar version " I3_VERSION " © 2010-2011 Axel Wagner and contributors\n");
                 exit(EXIT_SUCCESS);
                 break;
             case 'V':
diff --git a/i3bar/yajl-fallback/yajl/yajl_version.h b/i3bar/yajl-fallback/yajl/yajl_version.h
deleted file mode 100644
index c6da442e..00000000
--- a/i3bar/yajl-fallback/yajl/yajl_version.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef YAJL_VERSION_H_
-#define YAJL_VERSION_H_
-/* Fallback for libyajl 1 which does not provide yajl_version.h */
-#define YAJL_MAJOR 1
-#define YAJL_MINOR 0
-#define YAJL_MICRO 0
-#endif