diff --git a/fedora-i3-4.0.1-common.mk b/fedora-i3-4.0.1-common.mk
deleted file mode 100644
index e246da7..0000000
--- a/fedora-i3-4.0.1-common.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-INSTALL=install -p
-PREFIX=PUTINPREFIXHERE
-SYSCONFDIR=PUTINSYSCONFDIRHERE
-TERM_EMU=xterm
-GIT_VERSION:=4.0.1
-VERSION:=4.0.1
-cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1))
-ldflags_for_lib = $(shell pkg-config --exists $(1) && pkg-config --libs $(1) || echo -l$(2))
-
-CFLAGS += PUTINOPTFLAGSHERE -std=c99 -std=gnu99
-CFLAGS += -IPUTININCLUDEDIRHERE
-CFLAGS += -IPUTININCLUDEDIRHERE/libev
-CFLAGS += -Wunused-result
-CFLAGS += -Wunused-value
-CFLAGS += -Iinclude
-CFLAGS += $(call cflags_for_lib, xcb-keysyms)
-ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
-CPPFLAGS += -DXCB_COMPAT
-CFLAGS += $(call cflags_for_lib, xcb-atom)
-CFLAGS += $(call cflags_for_lib, xcb-aux)
-else
-CFLAGS += $(call cflags_for_lib, xcb-util)
-endif
-CFLAGS += $(call cflags_for_lib, xcb-icccm)
-CFLAGS += $(call cflags_for_lib, xcb-xinerama)
-CFLAGS += $(call cflags_for_lib, xcb-randr)
-CFLAGS += $(call cflags_for_lib, xcb)
-CFLAGS += $(call cflags_for_lib, xcursor)
-CFLAGS += $(call cflags_for_lib, x11)
-CFLAGS += $(call cflags_for_lib, yajl)
-CFLAGS += $(call cflags_for_lib, libev)
-CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
-CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
-
-LIBS += -lm
-LIBS += $(call ldflags_for_lib, xcb-event, xcb-event)
-LIBS += $(call ldflags_for_lib, xcb-keysyms, xcb-keysyms)
-ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
-LIBS += $(call ldflags_for_lib, xcb-atom, xcb-atom)
-LIBS += $(call ldflags_for_lib, xcb-aux, xcb-aux)
-else
-LIBS += $(call ldflags_for_lib, xcb-util)
-endif
-LIBS += $(call ldflags_for_lib, xcb-icccm, xcb-icccm)
-LIBS += $(call ldflags_for_lib, xcb-xinerama, xcb-xinerama)
-LIBS += $(call ldflags_for_lib, xcb-randr, xcb-randr)
-LIBS += $(call ldflags_for_lib, xcb, xcb)
-LIBS += $(call ldflags_for_lib, xcursor, Xcursor)
-LIBS += $(call ldflags_for_lib, x11, X11)
-LIBS += $(call ldflags_for_lib, yajl, yajl)
-LIBS += $(call ldflags_for_lib, libev, ev)
-
-# Please test if -Wl,--as-needed works on your platform and send me a patch.
-# it is known not to work on Darwin (Mac OS X)
-#ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-#LDFLAGS += -Wl,--as-needed
-#endif
-
-CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
-
-#ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-#CPPFLAGS += -D_GNU_SOURCE
-#endif
-
-.PHONY: install clean dist distclean
-
diff --git a/fedora-i3-4.1.2-common.mk b/fedora-i3-4.1.2-common.mk
deleted file mode 100644
index b6c15ed..0000000
--- a/fedora-i3-4.1.2-common.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-INSTALL=install -p
-PREFIX=PUTINPREFIXHERE
-SYSCONFDIR=PUTINSYSCONFDIRHERE
-TERM_EMU=xterm
-GIT_VERSION:=4.0.1
-VERSION:=4.0.1
-cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1))
-ldflags_for_lib = $(shell pkg-config --exists $(1) && pkg-config --libs $(1) || echo -l$(2))
-
-CFLAGS += PUTINOPTFLAGSHERE -std=c99 -std=gnu99
-CFLAGS += -IPUTININCLUDEDIRHERE
-CFLAGS += -IPUTININCLUDEDIRHERE/libev
-CFLAGS += -Wunused-result
-CFLAGS += -Wunused-value
-CFLAGS += -Iinclude
-CFLAGS += $(call cflags_for_lib, xcb-keysyms)
-ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
-CPPFLAGS += -DXCB_COMPAT
-CFLAGS += $(call cflags_for_lib, xcb-atom)
-CFLAGS += $(call cflags_for_lib, xcb-aux)
-else
-CFLAGS += $(call cflags_for_lib, xcb-util)
-endif
-CFLAGS += $(call cflags_for_lib, xcb-icccm)
-CFLAGS += $(call cflags_for_lib, xcb-xinerama)
-CFLAGS += $(call cflags_for_lib, xcb-randr)
-CFLAGS += $(call cflags_for_lib, xcb)
-CFLAGS += $(call cflags_for_lib, xcursor)
-CFLAGS += $(call cflags_for_lib, x11)
-CFLAGS += $(call cflags_for_lib, yajl)
-CFLAGS += $(call cflags_for_lib, libev)
-CFLAGS += $(call cflags_for_lib, libpcre,pcre)
-CFLAGS += $(call cflags_for_lib, libstartup-notification-1.0)
-CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
-CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
-
-LIBS += -lm
-LIBS += -L $(TOPDIR)/libi3 -li3
-LIBS += $(call ldflags_for_lib, xcb-event, xcb-event)
-LIBS += $(call ldflags_for_lib, xcb-keysyms, xcb-keysyms)
-ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
-LIBS += $(call ldflags_for_lib, xcb-atom, xcb-atom)
-LIBS += $(call ldflags_for_lib, xcb-aux, xcb-aux)
-else
-LIBS += $(call ldflags_for_lib, xcb-util)
-endif
-LIBS += $(call ldflags_for_lib, xcb-icccm, xcb-icccm)
-LIBS += $(call ldflags_for_lib, xcb-xinerama, xcb-xinerama)
-LIBS += $(call ldflags_for_lib, xcb-randr, xcb-randr)
-LIBS += $(call ldflags_for_lib, xcb, xcb)
-LIBS += $(call ldflags_for_lib, xcursor, Xcursor)
-LIBS += $(call ldflags_for_lib, x11, X11)
-LIBS += $(call ldflags_for_lib, yajl, yajl)
-LIBS += $(call ldflags_for_lib, libev, ev)
-LIBS += $(call ldflags_for_lib, libpcre,pcre)
-LIBS += $(call ldflags_for_lib, libstartup-notification-1.0)
-
-# Please test if -Wl,--as-needed works on your platform and send me a patch.
-# it is known not to work on Darwin (Mac OS X)
-#ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-#LDFLAGS += -Wl,--as-needed
-#endif
-
-CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
-
-#ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-#CPPFLAGS += -D_GNU_SOURCE
-#endif
-
-.PHONY: install clean dist distclean
-
diff --git a/fedora-i3-4.2-common.mk b/fedora-i3-4.2-common.mk
deleted file mode 100644
index f5e7f9b..0000000
--- a/fedora-i3-4.2-common.mk
+++ /dev/null
@@ -1,132 +0,0 @@
-UNAME=$(shell uname)
-DEBUG=1
-COVERAGE=0
-INSTALL=install
-FLEX=flex
-BISON=bison
-# Fedora changes begin
-PREFIX=PUTINPREFIXHERE
-SYSCONFDIR=PUTINSYSCONFDIRHERE
-# Fedora changes end
-
-# The escaping is absurd, but we need to escape for shell, sed, make, define
-GIT_VERSION:="4.2 (2012-04-25, branch \\\"release-4.2\\\")"
-VERSION:=4.2
-
-ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
-$(error "pkg-config was not found")
-endif
-
-# An easier way to get CFLAGS and LDFLAGS falling back in case there's
-# no pkg-config support for certain libraries.
-#
-# NOTE that you must not use a blank after comma when calling this:
-#     $(call ldflags_for_lib name, fallback) # bad
-#     $(call ldflags_for_lib name,fallback) # good
-# Otherwise, the compiler will get -l foo instead of -lfoo
-#
-# We redirect stderr to /dev/null because pkg-config prints an error if support
-# for gnome-config was enabled but gnome-config is not actually installed.
-cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1) 2>/dev/null)
-ldflags_for_lib = $(shell pkg-config --exists 2>/dev/null $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2))
-
-# Fedora changes begin
-CFLAGS += PUTINOPTFLAGSHERE -std=c99 -std=gnu99
-CFLAGS += -IPUTININCLUDEDIRHERE
-CFLAGS += -IPUTININCLUDEDIRHERE/libev
-# Fedora changes end
-
-# unused-function, unused-label, unused-variable are turned on by -Wall
-# We don’t want unused-parameter because of the use of many callbacks
-CFLAGS += -Wunused-value
-CFLAGS += -Iinclude
-CFLAGS += $(call cflags_for_lib, xcb-keysyms)
-ifeq ($(shell pkg-config --exists xcb-util 2>/dev/null || echo 1),1)
-CPPFLAGS += -DXCB_COMPAT
-CFLAGS += $(call cflags_for_lib, xcb-atom)
-CFLAGS += $(call cflags_for_lib, xcb-aux)
-else
-CFLAGS += $(call cflags_for_lib, xcb-util)
-endif
-CFLAGS += $(call cflags_for_lib, xcb-icccm)
-CFLAGS += $(call cflags_for_lib, xcb-xinerama)
-CFLAGS += $(call cflags_for_lib, xcb-randr)
-CFLAGS += $(call cflags_for_lib, xcb)
-CFLAGS += $(call cflags_for_lib, xcursor)
-CFLAGS += $(call cflags_for_lib, x11)
-CFLAGS += $(call cflags_for_lib, yajl)
-CFLAGS += $(call cflags_for_lib, libev)
-CFLAGS += $(call cflags_for_lib, libpcre)
-CFLAGS += $(call cflags_for_lib, libstartup-notification-1.0)
-CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
-
-ifeq ($(shell pkg-config --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
-CPPFLAGS += -DPCRE_HAS_UCP=1
-endif
-
-LIBS += -lm
-LIBS += -lrt
-LIBS += -L $(TOPDIR)/libi3 -li3
-LIBS += $(call ldflags_for_lib, xcb-event,xcb-event)
-LIBS += $(call ldflags_for_lib, xcb-keysyms,xcb-keysyms)
-ifeq ($(shell pkg-config --exists xcb-util 2>/dev/null || echo 1),1)
-LIBS += $(call ldflags_for_lib, xcb-atom,xcb-atom)
-LIBS += $(call ldflags_for_lib, xcb-aux,xcb-aux)
-else
-LIBS += $(call ldflags_for_lib, xcb-util)
-endif
-LIBS += $(call ldflags_for_lib, xcb-icccm,xcb-icccm)
-LIBS += $(call ldflags_for_lib, xcb-xinerama,xcb-xinerama)
-LIBS += $(call ldflags_for_lib, xcb-randr,xcb-randr)
-LIBS += $(call ldflags_for_lib, xcb,xcb)
-LIBS += $(call ldflags_for_lib, xcursor,Xcursor)
-LIBS += $(call ldflags_for_lib, x11,X11)
-LIBS += $(call ldflags_for_lib, yajl,yajl)
-LIBS += $(call ldflags_for_lib, libev,ev)
-LIBS += $(call ldflags_for_lib, libpcre,pcre)
-LIBS += $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1)
-
-# Please test if -Wl,--as-needed works on your platform and send me a patch.
-# it is known not to work on Darwin (Mac OS X)
-ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-LDFLAGS += -Wl,--as-needed
-endif
-
-ifeq ($(UNAME),NetBSD)
-# We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
-CFLAGS += -idirafter /usr/pkg/include
-LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
-endif
-
-ifeq ($(UNAME),OpenBSD)
-CFLAGS += -I${X11BASE}/include
-LIBS += -liconv
-LDFLAGS += -L${X11BASE}/lib
-endif
-
-ifeq ($(UNAME),FreeBSD)
-LIBS += -liconv
-endif
-
-ifeq ($(UNAME),Darwin)
-LIBS += -liconv
-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 $(TOPDIR)/yajl-fallback
-
-ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-CPPFLAGS += -D_GNU_SOURCE
-endif
-
-# Fedora changes - removed DEBUG and COVERAGE
-
-# Don’t print command lines which are run
-.SILENT:
-
-# Always remake the following targets
-.PHONY: install clean dist distclean
-
-
diff --git a/fedora-i3-4.3-common.mk b/fedora-i3-4.3-common.mk
deleted file mode 100644
index e5033a0..0000000
--- a/fedora-i3-4.3-common.mk
+++ /dev/null
@@ -1,148 +0,0 @@
-UNAME=$(shell uname)
-DEBUG=1
-COVERAGE=0
-INSTALL=install
-FLEX=flex
-BISON=bison
-# Fedora changes begin
-PREFIX=PUTINPREFIXHERE
-SYSCONFDIR=PUTINSYSCONFDIRHERE
-# Fedora changes end
-
-# The escaping is absurd, but we need to escape for shell, sed, make, define
-GIT_VERSION:="4.3 (2012-09-19, branch \\\"release-4.3\\\")"
-VERSION:=4.3-1
-
-
-MAJOR_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 1)
-MINOR_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 2)
-PATCH_VERSION := $(shell echo ${VERSION} | cut -d '-' -f 2)
-
-ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
-$(error "pkg-config was not found")
-endif
-
-# An easier way to get CFLAGS and LDFLAGS falling back in case there's
-# no pkg-config support for certain libraries.
-#
-# NOTE that you must not use a blank after comma when calling this:
-#     $(call ldflags_for_lib name, fallback) # bad
-#     $(call ldflags_for_lib name,fallback) # good
-# Otherwise, the compiler will get -l foo instead of -lfoo
-#
-# We redirect stderr to /dev/null because pkg-config prints an error if support
-# for gnome-config was enabled but gnome-config is not actually installed.
-cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1) 2>/dev/null)
-ldflags_for_lib = $(shell pkg-config --exists 2>/dev/null $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2))
-
-# Fedora changes begin
-CFLAGS += PUTINOPTFLAGSHERE -std=c99 -std=gnu99
-CFLAGS += -IPUTININCLUDEDIRHERE
-CFLAGS += -IPUTININCLUDEDIRHERE/libev
-# Fedora changes end
-
-# unused-function, unused-label, unused-variable are turned on by -Wall
-# We don’t want unused-parameter because of the use of many callbacks
-CFLAGS += -Wunused-value
-CFLAGS += -Iinclude
-CFLAGS += $(call cflags_for_lib, xcb-keysyms)
-ifeq ($(shell pkg-config --exists xcb-util 2>/dev/null || echo 1),1)
-CPPFLAGS += -DXCB_COMPAT
-CFLAGS += $(call cflags_for_lib, xcb-atom)
-CFLAGS += $(call cflags_for_lib, xcb-aux)
-else
-CFLAGS += $(call cflags_for_lib, xcb-util)
-endif
-CFLAGS += $(call cflags_for_lib, xcb-icccm)
-CFLAGS += $(call cflags_for_lib, xcb-xinerama)
-CFLAGS += $(call cflags_for_lib, xcb-randr)
-CFLAGS += $(call cflags_for_lib, xcb)
-CFLAGS += $(call cflags_for_lib, xcursor)
-CFLAGS += $(call cflags_for_lib, x11)
-CFLAGS += $(call cflags_for_lib, yajl)
-CFLAGS += $(call cflags_for_lib, libev)
-CFLAGS += $(call cflags_for_lib, libpcre)
-CFLAGS += $(call cflags_for_lib, libstartup-notification-1.0)
-CFLAGS += $(call cflags_for_lib, cairo)
-CFLAGS += $(call cflags_for_lib, pango)
-
-CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-CPPFLAGS += -DMAJOR_VERSION=${MAJOR_VERSION}
-CPPFLAGS += -DMINOR_VERSION=${MINOR_VERSION}
-CPPFLAGS += -DPATCH_VERSION=${PATCH_VERSION}
-CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
-CPPFLAGS += -DPANGO_SUPPORT=1
-
-ifeq ($(shell pkg-config --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
-CPPFLAGS += -DPCRE_HAS_UCP=1
-endif
-
-LIBS += -lm
-LIBS += -lrt
-LIBS += -L $(TOPDIR) -li3
-LIBS += $(call ldflags_for_lib, xcb-event,xcb-event)
-LIBS += $(call ldflags_for_lib, xcb-keysyms,xcb-keysyms)
-ifeq ($(shell pkg-config --exists xcb-util 2>/dev/null || echo 1),1)
-LIBS += $(call ldflags_for_lib, xcb-atom,xcb-atom)
-LIBS += $(call ldflags_for_lib, xcb-aux,xcb-aux)
-else
-LIBS += $(call ldflags_for_lib, xcb-util)
-endif
-LIBS += $(call ldflags_for_lib, xcb-icccm,xcb-icccm)
-LIBS += $(call ldflags_for_lib, xcb-xinerama,xcb-xinerama)
-LIBS += $(call ldflags_for_lib, xcb-randr,xcb-randr)
-LIBS += $(call ldflags_for_lib, xcb,xcb)
-LIBS += $(call ldflags_for_lib, xcursor,Xcursor)
-LIBS += $(call ldflags_for_lib, x11,X11)
-LIBS += $(call ldflags_for_lib, yajl,yajl)
-LIBS += $(call ldflags_for_lib, libev,ev)
-LIBS += $(call ldflags_for_lib, libpcre,pcre)
-LIBS += $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1)
-LIBS += $(call ldflags_for_lib, cairo)
-LIBS += $(call ldflags_for_lib, pango)
-LIBS += $(call ldflags_for_lib, pangocairo)
-
-
-# Please test if -Wl,--as-needed works on your platform and send me a patch.
-# it is known not to work on Darwin (Mac OS X)
-ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-LDFLAGS += -Wl,--as-needed
-endif
-
-ifeq ($(UNAME),NetBSD)
-# We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
-CFLAGS += -idirafter /usr/pkg/include
-LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
-endif
-
-ifeq ($(UNAME),OpenBSD)
-CFLAGS += -I${X11BASE}/include
-LIBS += -liconv
-LDFLAGS += -L${X11BASE}/lib
-endif
-
-ifeq ($(UNAME),FreeBSD)
-LIBS += -liconv
-endif
-
-ifeq ($(UNAME),Darwin)
-LIBS += -liconv
-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 $(TOPDIR)/yajl-fallback
-
-ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-CPPFLAGS += -D_GNU_SOURCE
-endif
-
-# Fedora changes - removed DEBUG and COVERAGE
-
-# Don’t print command lines which are run
-.SILENT:
-
-# Always remake the following targets
-.PHONY: install clean dist distclean
-
-
diff --git a/fedora-i3-4.4-common.mk b/fedora-i3-4.4-common.mk
deleted file mode 100644
index db95f49..0000000
--- a/fedora-i3-4.4-common.mk
+++ /dev/null
@@ -1,198 +0,0 @@
-UNAME=$(shell uname)
-DEBUG=1
-COVERAGE=0
-INSTALL=install
-FLEX=flex
-BISON=bison
-# Fedora changes begin
-PREFIX=PUTINPREFIXHERE
-SYSCONFDIR=PUTINSYSCONFDIRHERE
-# Fedora changes end
-
-# In dist tarballs, the version is stored in the I3_VERSION and VERSION files.
-I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
-VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
-ifeq ('',$(I3_VERSION))
-VERSION := $(shell git describe --tags --abbrev=0)
-I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")'
-endif
-
-MAJOR_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 1)
-MINOR_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 2)
-PATCH_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 3)
-ifeq (${PATCH_VERSION},)
-PATCH_VERSION := 0
-endif
-
-## Generic flags
-
-# Default CFLAGS that users should be able to override
-ifeq ($(DEBUG),1)
-# Extended debugging flags, macros shall be available in gcc
-CFLAGS ?= -pipe -gdwarf-2 -g3
-else
-CFLAGS ?= -pipe -O2 -freorder-blocks-and-partition
-endif
-
-# Default LDFLAGS that users should be able to override
-LDFLAGS ?= $(as_needed_LDFLAG)
-
-# Common CFLAGS for all i3 related binaries
-I3_CFLAGS  = -std=c99
-I3_CFLAGS += -Wall
-# unused-function, unused-label, unused-variable are turned on by -Wall
-# We don’t want unused-parameter because of the use of many callbacks
-I3_CFLAGS += -Wunused-value
-I3_CFLAGS += -Iinclude
-
-I3_CPPFLAGS  = -DI3_VERSION=\"${I3_VERSION}\"
-I3_CPPFLAGS += -DMAJOR_VERSION=${MAJOR_VERSION}
-I3_CPPFLAGS += -DMINOR_VERSION=${MINOR_VERSION}
-I3_CPPFLAGS += -DPATCH_VERSION=${PATCH_VERSION}
-I3_CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
-I3_CPPFLAGS += -DI3__FILE__=__FILE__
-
-
-## Libraries flags
-
-ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
-$(error "pkg-config was not found")
-endif
-
-# An easier way to get CFLAGS and LDFLAGS falling back in case there's
-# no pkg-config support for certain libraries.
-#
-# NOTE that you must not use a blank after comma when calling this:
-#     $(call ldflags_for_lib name, fallback) # bad
-#     $(call ldflags_for_lib name,fallback) # good
-# Otherwise, the compiler will get -l foo instead of -lfoo
-#
-# We redirect stderr to /dev/null because pkg-config prints an error if support
-# for gnome-config was enabled but gnome-config is not actually installed.
-cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1) 2>/dev/null)
-ldflags_for_lib = $(shell pkg-config --exists 2>/dev/null $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2))
-
-# XCB common stuff
-XCB_CFLAGS  := $(call cflags_for_lib, xcb)
-XCB_CFLAGS  += $(call cflags_for_lib, xcb-event)
-XCB_LIBS    := $(call ldflags_for_lib, xcb,xcb)
-XCB_LIBS    += $(call ldflags_for_lib, xcb-event,xcb-event)
-ifeq ($(shell pkg-config --exists xcb-util 2>/dev/null || echo 1),1)
-XCB_CFLAGS  += $(call cflags_for_lib, xcb-atom)
-XCB_CFLAGS  += $(call cflags_for_lib, xcb-aux)
-XCB_LIBS    += $(call ldflags_for_lib, xcb-atom,xcb-atom)
-XCB_LIBS    += $(call ldflags_for_lib, xcb-aux,xcb-aux)
-XCB_CPPFLAGS+= -DXCB_COMPAT
-else
-XCB_CFLAGS  += $(call cflags_for_lib, xcb-util)
-XCB_LIBS    += $(call ldflags_for_lib, xcb-util)
-endif
-
-# XCB keyboard stuff
-XCB_KBD_CFLAGS := $(call cflags_for_lib, xcb-keysyms)
-XCB_KBD_LIBS   := $(call ldflags_for_lib, xcb-keysyms,xcb-keysyms)
-
-# XCB WM stuff
-XCB_WM_CFLAGS := $(call cflags_for_lib, xcb-icccm)
-XCB_WM_CFLAGS += $(call cflags_for_lib, xcb-xinerama)
-XCB_WM_CFLAGS += $(call cflags_for_lib, xcb-randr)
-XCB_WM_LIBS   := $(call ldflags_for_lib, xcb-icccm,xcb-icccm)
-XCB_WM_LIBS   += $(call ldflags_for_lib, xcb-xinerama,xcb-xinerama)
-XCB_WM_LIBS   += $(call ldflags_for_lib, xcb-randr,xcb-randr)
-
-# Xlib
-X11_CFLAGS := $(call cflags_for_lib, x11)
-X11_LIBS   := $(call ldflags_for_lib, x11,X11)
-
-# Xcursor
-XCURSOR_CFLAGS := $(call cflags_for_lib, xcursor)
-XCURSOR_LIBS   := $(call ldflags_for_lib, xcursor,Xcursor)
-
-# yajl
-YAJL_CFLAGS := $(call cflags_for_lib, yajl)
-# 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.
-YAJL_CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
-YAJL_LIBS   := $(call ldflags_for_lib, yajl,yajl)
-
-#libev
-LIBEV_CFLAGS := $(call cflags_for_lib, libev)
-LIBEV_LIBS   := $(call ldflags_for_lib, libev,ev)
-
-# libpcre
-PCRE_CFLAGS := $(call cflags_for_lib, libpcre)
-ifeq ($(shell pkg-config --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
-I3_CPPFLAGS += -DPCRE_HAS_UCP=1
-endif
-PCRE_LIBS   := $(call ldflags_for_lib, libpcre,pcre)
-
-# startup-notification
-LIBSN_CFLAGS := $(call cflags_for_lib, libstartup-notification-1.0)
-LIBSN_LIBS   := $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1)
-
-# Pango
-PANGO_CFLAGS := $(call cflags_for_lib, cairo)
-PANGO_CFLAGS += $(call cflags_for_lib, pangocairo)
-I3_CPPFLAGS  += -DPANGO_SUPPORT=1
-PANGO_LIBS   := $(call ldflags_for_lib, cairo)
-PANGO_LIBS   += $(call ldflags_for_lib, pangocairo)
-
-# libi3
-LIBS = -L$(TOPDIR) -li3
-
-## Platform-specific flags
-
-# Please test if -Wl,--as-needed works on your platform and send me a patch.
-# it is known not to work on Darwin (Mac OS X)
-ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-as_needed_LDFLAG = -Wl,--as-needed
-endif
-
-ifeq ($(UNAME),NetBSD)
-# We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
-I3_CFLAGS += -idirafter /usr/pkg/include
-I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
-endif
-
-ifeq ($(UNAME),OpenBSD)
-I3_CFLAGS += -I${X11BASE}/include
-LIBS += -liconv
-I3_LDFLAGS += -L${X11BASE}/lib
-endif
-
-ifeq ($(UNAME),FreeBSD)
-LIBS += -liconv
-endif
-
-ifeq ($(UNAME),Darwin)
-LIBS += -liconv
-else
-# Darwin (Mac OS X) doesn’t have librt
-LIBS += -lrt
-endif
-
-ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-I3_CPPFLAGS += -D_GNU_SOURCE
-endif
-
-
-ifeq ($(COVERAGE),1)
-I3_CFLAGS += -fprofile-arcs -ftest-coverage
-LIBS += -lgcov
-endif
-
-V ?= 0
-ifeq ($(V),0)
-# Don’t print command lines which are run
-.SILENT:
-
-# echo-ing vars
-V_ASCIIDOC = echo ASCIIDOC $@;
-V_POD2HTML = echo POD2HTML $@;
-V_POD2MAN = echo POD2MAN $@;
-V_A2X = echo A2X $@;
-endif
-
-# Always remake the following targets
-.PHONY: install clean dist distclean
-
diff --git a/fedora-i3-4.5-common.mk b/fedora-i3-4.5-common.mk
new file mode 100644
index 0000000..a1973b6
--- /dev/null
+++ b/fedora-i3-4.5-common.mk
@@ -0,0 +1,201 @@
+UNAME=$(shell uname)
+DEBUG=1
+COVERAGE=0
+INSTALL=install
+FLEX=flex
+BISON=bison
+# Fedora changes begin
+PREFIX=PUTINPREFIXHERE
+SYSCONFDIR=PUTINSYSCONFDIRHERE
+# Fedora changes end
+
+# In dist tarballs, the version is stored in the I3_VERSION and VERSION files.
+I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
+VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
+ifeq ('',$(I3_VERSION))
+VERSION := $(shell git describe --tags --abbrev=0)
+I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")'
+endif
+
+MAJOR_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 1)
+MINOR_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 2)
+PATCH_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 3)
+ifeq (${PATCH_VERSION},)
+PATCH_VERSION := 0
+endif
+
+## Generic flags
+
+# Default CFLAGS that users should be able to override
+ifeq ($(DEBUG),1)
+# Extended debugging flags, macros shall be available in gcc
+CFLAGS ?= -pipe -gdwarf-2 -g3
+else
+CFLAGS ?= -pipe -O2 -freorder-blocks-and-partition
+endif
+
+# Default LDFLAGS that users should be able to override
+LDFLAGS ?= $(as_needed_LDFLAG)
+
+# Common CFLAGS for all i3 related binaries
+# Fedora changes begin
+I3_CFLAGS  = PUTINOPTFLAGSHERE -std=c99
+# Fedora changes end
+I3_CFLAGS += -Wall
+# unused-function, unused-label, unused-variable are turned on by -Wall
+# We don’t want unused-parameter because of the use of many callbacks
+I3_CFLAGS += -Wunused-value
+I3_CFLAGS += -Iinclude
+
+I3_CPPFLAGS  = -DI3_VERSION=\"${I3_VERSION}\"
+I3_CPPFLAGS += -DMAJOR_VERSION=${MAJOR_VERSION}
+I3_CPPFLAGS += -DMINOR_VERSION=${MINOR_VERSION}
+I3_CPPFLAGS += -DPATCH_VERSION=${PATCH_VERSION}
+I3_CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
+I3_CPPFLAGS += -DI3__FILE__=__FILE__
+
+
+## Libraries flags
+
+ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
+$(error "pkg-config was not found")
+endif
+
+# An easier way to get CFLAGS and LDFLAGS falling back in case there's
+# no pkg-config support for certain libraries.
+#
+# NOTE that you must not use a blank after comma when calling this:
+#     $(call ldflags_for_lib name, fallback) # bad
+#     $(call ldflags_for_lib name,fallback) # good
+# Otherwise, the compiler will get -l foo instead of -lfoo
+#
+# We redirect stderr to /dev/null because pkg-config prints an error if support
+# for gnome-config was enabled but gnome-config is not actually installed.
+cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1) 2>/dev/null)
+ldflags_for_lib = $(shell pkg-config --exists 2>/dev/null $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2))
+
+
+# XCB common stuff
+XCB_CFLAGS  := $(call cflags_for_lib, xcb)
+XCB_CFLAGS  += $(call cflags_for_lib, xcb-event)
+XCB_LIBS    := $(call ldflags_for_lib, xcb,xcb)
+XCB_LIBS    += $(call ldflags_for_lib, xcb-event,xcb-event)
+ifeq ($(shell pkg-config --exists xcb-util 2>/dev/null || echo 1),1)
+XCB_CFLAGS  += $(call cflags_for_lib, xcb-atom)
+XCB_CFLAGS  += $(call cflags_for_lib, xcb-aux)
+XCB_LIBS    += $(call ldflags_for_lib, xcb-atom,xcb-atom)
+XCB_LIBS    += $(call ldflags_for_lib, xcb-aux,xcb-aux)
+XCB_CPPFLAGS+= -DXCB_COMPAT
+else
+XCB_CFLAGS  += $(call cflags_for_lib, xcb-util)
+XCB_LIBS    += $(call ldflags_for_lib, xcb-util)
+endif
+
+# XCB keyboard stuff
+XCB_KBD_CFLAGS := $(call cflags_for_lib, xcb-keysyms)
+XCB_KBD_LIBS   := $(call ldflags_for_lib, xcb-keysyms,xcb-keysyms)
+
+# XCB WM stuff
+XCB_WM_CFLAGS := $(call cflags_for_lib, xcb-icccm)
+XCB_WM_CFLAGS += $(call cflags_for_lib, xcb-xinerama)
+XCB_WM_CFLAGS += $(call cflags_for_lib, xcb-randr)
+XCB_WM_LIBS   := $(call ldflags_for_lib, xcb-icccm,xcb-icccm)
+XCB_WM_LIBS   += $(call ldflags_for_lib, xcb-xinerama,xcb-xinerama)
+XCB_WM_LIBS   += $(call ldflags_for_lib, xcb-randr,xcb-randr)
+
+# Xlib
+X11_CFLAGS := $(call cflags_for_lib, x11)
+X11_LIBS   := $(call ldflags_for_lib, x11,X11)
+
+# Xcursor
+XCURSOR_CFLAGS := $(call cflags_for_lib, xcursor)
+XCURSOR_LIBS   := $(call ldflags_for_lib, xcursor,Xcursor)
+
+# yajl
+YAJL_CFLAGS := $(call cflags_for_lib, yajl)
+# 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.
+YAJL_CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
+YAJL_LIBS   := $(call ldflags_for_lib, yajl,yajl)
+
+#libev
+LIBEV_CFLAGS := $(call cflags_for_lib, libev)
+LIBEV_LIBS   := $(call ldflags_for_lib, libev,ev)
+
+# libpcre
+PCRE_CFLAGS := $(call cflags_for_lib, libpcre)
+ifeq ($(shell pkg-config --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
+I3_CPPFLAGS += -DPCRE_HAS_UCP=1
+endif
+PCRE_LIBS   := $(call ldflags_for_lib, libpcre,pcre)
+
+# startup-notification
+LIBSN_CFLAGS := $(call cflags_for_lib, libstartup-notification-1.0)
+LIBSN_LIBS   := $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1)
+
+# Pango
+PANGO_CFLAGS := $(call cflags_for_lib, cairo)
+PANGO_CFLAGS += $(call cflags_for_lib, pangocairo)
+I3_CPPFLAGS  += -DPANGO_SUPPORT=1
+PANGO_LIBS   := $(call ldflags_for_lib, cairo)
+PANGO_LIBS   += $(call ldflags_for_lib, pangocairo)
+
+# libi3
+LIBS = -L$(TOPDIR) -li3
+
+## Platform-specific flags
+
+# Please test if -Wl,--as-needed works on your platform and send me a patch.
+# it is known not to work on Darwin (Mac OS X)
+ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
+as_needed_LDFLAG = -Wl,--as-needed
+endif
+
+ifeq ($(UNAME),NetBSD)
+# We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
+I3_CFLAGS += -idirafter /usr/pkg/include
+I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
+endif
+
+ifeq ($(UNAME),OpenBSD)
+I3_CFLAGS += -I${X11BASE}/include
+LIBS += -liconv
+I3_LDFLAGS += -L${X11BASE}/lib
+endif
+
+ifeq ($(UNAME),FreeBSD)
+LIBS += -liconv
+endif
+
+ifeq ($(UNAME),Darwin)
+LIBS += -liconv
+else
+# Darwin (Mac OS X) doesn’t have librt
+LIBS += -lrt
+endif
+
+ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
+I3_CPPFLAGS += -D_GNU_SOURCE
+endif
+
+
+ifeq ($(COVERAGE),1)
+I3_CFLAGS += -fprofile-arcs -ftest-coverage
+LIBS += -lgcov
+endif
+
+V ?= 0
+ifeq ($(V),0)
+# Don’t print command lines which are run
+.SILENT:
+
+# echo-ing vars
+V_ASCIIDOC = echo ASCIIDOC $@;
+V_POD2HTML = echo POD2HTML $@;
+V_POD2MAN = echo POD2MAN $@;
+V_A2X = echo A2X $@;
+endif
+
+# Always remake the following targets
+.PHONY: install clean dist distclean
+
diff --git a/i3.spec b/i3.spec
index 9a67237..ff0a3d8 100644
--- a/i3.spec
+++ b/i3.spec
@@ -1,6 +1,6 @@
 Name:           i3
-Version:        4.4
-Release:        2%{?dist}
+Version:        4.5
+Release:        1%{?dist}
 Summary:        Improved tiling window manager
 Group:          User Interface/Desktops
 License:        BSD
@@ -68,7 +68,6 @@ sed \
 
 sed \
     -e 's|PUTINOPTFLAGSHERE|%{optflags}|g' \
-    -e 's|PUTININCLUDEDIRHERE|%{_includedir}|g' \
     -e 's|PUTINPREFIXHERE|%{_prefix}|g' \
     -e 's|PUTINSYSCONFDIRHERE|%{_sysconfdir}|g' \
     -i fedora-%{name}-%{version}-common.mk
@@ -116,6 +115,9 @@ install -Dpm0644 %{SOURCE1} \
 
 
 %changelog
+* Tue Mar 12 2013 Simon Wesp <cassmodiah@fedoraproject.org> - 4.5-1
+- New upstream release
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index d36d2db..613d663 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa2b8aae3d2e10c5ee480bd370366f5b  i3-4.4.tar.bz2
+9eea2f570ec19affa3ec60b5ab411497  i3-4.5.tar.bz2