diff --git a/.cvsignore b/.cvsignore
index 658146d..26601a6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-i3-3.d-bf1-20100320git.tar.bz2
+i3-3.e.tar.bz2
diff --git a/i3.spec b/i3.spec
index f87d9b7..9a3b751 100644
--- a/i3.spec
+++ b/i3.spec
@@ -1,19 +1,11 @@
-%global upstream_version 3.d-bf1
-%global git 20100320git
-%global gitversion bbea32f
-
 Name:           i3
-Version:        3.d.bf1
-Release:        4.%{git}%{?dist}
+Version:        3.e
+Release:        1%{?dist}
 Summary:        Improved tiling window manager
 Group:          User Interface/Desktops
 License:        BSD
 URL:            http://i3.zekjur.net
-#Source0:        http://i3.zekjur.net/downloads/%{name}-%{upstream_version}.tar.bz2
-# git clone git://code.stapelberg.de/%{name}
-# cd %{name} && git reset --hard %{gitversion} && rm -rf .git .gitingore && cd ..
-# tar -czvf {name}-%{upstream_version}-%{git}.tar.bz2 %{name}
-Source0:        %{name}-%{upstream_version}-%{git}.tar.bz2
+Source0:        http://i3.zekjur.net/downloads/%{name}-%{version}.tar.bz2
 Source1:        %{name}-logo.svg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +15,7 @@ BuildRequires:  xcb-proto
 BuildRequires:  libev-devel
 BuildRequires:  libxkbfile-devel
 BuildRequires:  libX11-devel
+BuildRequires:  yajl-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  asciidoc
@@ -56,18 +49,25 @@ Asciidoc and doxygen generated documentations for %{name}.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 sed \
-    -e 's|GIT_VERSION:=$(shell git describe --tags --always)|GIT_VERSION:=%{version}-%{git}|g' \
-    -e 's|VERSION:=$(shell git describe --tags --abbrev=0)|VERSION=%{version}-%{git}|g' \
-    -e 's|CFLAGS += -Wunused|CFLAGS += -I/usr/include/libev|g' \
     -e 's|CFLAGS += -Wall|CFLAGS += %{optflags}|g' \
-    -e 's|CFLAGS += -pipe|CFLAGS += |g' \
-    -e 's|CFLAGS += -I/usr/local/include|CFLAGS += -I/usr/include|g' \
+    -e 's|CFLAGS += -pipe|CFLAGS += -I/usr/include/libev |g' \
+    -e 's|CFLAGS += -I/usr/local/include|CFLAGS += -I%{_includedir}|g' \
+    -e 's|/usr/local/lib|%{_libdir}|g' \
     -e 's|.SILENT:||g' \
     -i common.mk
 
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+sed -e '/perl(AnyEvent::I3)/d'
+EOF
+
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
 
 %build
 make %{?_smp_mflags} V=1
@@ -102,8 +102,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc GOALS LICENSE RELEASE-NOTES-%{upstream_version}
+%doc GOALS LICENSE RELEASE-NOTES-%{version}
 %{_bindir}/%{name}*
+%{_includedir}/%{name}/*
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/config
 %config(noreplace) %{_sysconfdir}/%{name}/welcome
@@ -118,6 +119,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 30 2010 Simon Wesp <cassmodiah@fedoraproject.org> - 3.e-1
+- New upstream release
+
 * Sat Mar 20 2010 Simon Wesp <cassmodiah@fedoraproject.org> - 3.d.bf1-4.20100320git
 - Update to current git
 
diff --git a/import.log b/import.log
index eaa961d..7876cb9 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 i3-3_d-1_fc12:HEAD:i3-3.d-1.fc12.src.rpm:1259783250
 i3-3_d-bf1_1_fc12:HEAD:i3-3.d-bf1_1.fc12.src.rpm:1261776426
 i3-3_d_bf1-4_20100320git_fc12:F-13:i3-3.d.bf1-4.20100320git.fc12.src.rpm:1269111486
+i3-3_e-1_fc12:F-13:i3-3.e-1.fc12.src.rpm:1269977008
diff --git a/sources b/sources
index 87f0d1b..ea27af0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b14b04a4f187eb3beb719319f1a8495  i3-3.d-bf1-20100320git.tar.bz2
+28b70cc287e2c6607576171c3c6b3fdf  i3-3.e.tar.bz2