diff --git a/x11/i3/Makefile b/x11/i3/Makefile
index 5a2ca413f1c..362edaaa57e 100644
--- a/x11/i3/Makefile
+++ b/x11/i3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2012/09/16 06:24:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2012/09/16 22:05:46 ajacoutot Exp $
 
 COMMENT =	improved dynamic tiling window manager
 
@@ -44,7 +44,8 @@ NO_REGRESS =	Yes
 
 MAKE_FLAGS =	CC="${CC}" \
 		BISON="${LOCALBASE}/bin/bison" \
-		FLEX="${LOCALBASE}/bin/gflex"
+		FLEX="${LOCALBASE}/bin/gflex" \
+		SYSCONFDIR=${SYSCONFDIR}
 
 .if defined(DEBUG)
 MAKE_FLAGS +=	DEBUG=1
diff --git a/x11/i3/patches/patch-common_mk b/x11/i3/patches/patch-common_mk
index 2879f1113fe..54152a9ada8 100644
--- a/x11/i3/patches/patch-common_mk
+++ b/x11/i3/patches/patch-common_mk
@@ -1,6 +1,6 @@
-$OpenBSD: patch-common_mk,v 1.11 2012/09/16 06:24:32 ajacoutot Exp $
---- common.mk.orig	Mon May  7 16:43:19 2012
-+++ common.mk	Mon May  7 16:47:01 2012
+$OpenBSD: patch-common_mk,v 1.12 2012/09/16 22:05:46 ajacoutot Exp $
+--- common.mk.orig	Wed Apr 25 23:21:32 2012
++++ common.mk	Mon Sep 17 00:03:25 2012
 @@ -1,5 +1,5 @@
  UNAME=$(shell uname)
 -DEBUG=1
@@ -8,18 +8,7 @@ $OpenBSD: patch-common_mk,v 1.11 2012/09/16 06:24:32 ajacoutot Exp $
  COVERAGE=0
  INSTALL=install
  FLEX=flex
-@@ -8,86 +8,23 @@ ifndef PREFIX
-   PREFIX=/usr
- endif
- ifndef SYSCONFDIR
--  ifeq ($(PREFIX),/usr)
--    SYSCONFDIR=/etc
--  else
--    SYSCONFDIR=$(PREFIX)/etc
--  endif
-+  SYSCONFDIR=${SYSCONFDIR}
- endif
- # The escaping is absurd, but we need to escape for shell, sed, make, define
+@@ -18,76 +18,17 @@ endif
  GIT_VERSION:="4.2 (2012-04-25, branch \\\"release-4.2\\\")"
  VERSION:=4.2
  
@@ -98,7 +87,7 @@ $OpenBSD: patch-common_mk,v 1.11 2012/09/16 06:24:32 ajacoutot Exp $
  
  # 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)
-@@ -102,9 +39,9 @@ LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/p
+@@ -102,9 +43,9 @@ LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/p
  endif
  
  ifeq ($(UNAME),OpenBSD)
@@ -110,7 +99,7 @@ $OpenBSD: patch-common_mk,v 1.11 2012/09/16 06:24:32 ajacoutot Exp $
  endif
  
  ifeq ($(UNAME),FreeBSD)
-@@ -127,18 +64,12 @@ ifeq ($(DEBUG),1)
+@@ -127,18 +68,12 @@ ifeq ($(DEBUG),1)
  # Extended debugging flags, macros shall be available in gcc
  CFLAGS += -gdwarf-2
  CFLAGS += -g3