diff --git a/i3status-2.6.tar.bz2 b/i3status-2.6.tar.bz2
deleted file mode 100644
index 800b44f..0000000
--- a/i3status-2.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7e710cc271887bcd22757269e1b00a5618fb53abdb3455140116b3d38797bce
-size 34896
diff --git a/i3status-makefile.patch b/i3status-2.7-makefile.patch
similarity index 63%
rename from i3status-makefile.patch
rename to i3status-2.7-makefile.patch
index 7adcf46..d27626c 100644
--- a/i3status-makefile.patch
+++ b/i3status-2.7-makefile.patch
@@ -1,6 +1,16 @@
---- Makefile.orig	2012-11-24 19:34:13.213324417 +0100
-+++ Makefile	2012-11-24 19:35:39.068425956 +0100
-@@ -10,9 +10,9 @@
+From: Togan Muftuoglu <toganm@opensuse.org>
+Date: 2013-03-14 10:04:55 +0100
+Subject: Enable optflags in Makefile
+References:
+Upstream: no
+
+---
+ Makefile |   12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -10,9 +10,9 @@ ifndef SYSCONFDIR
  endif
  
  CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
@@ -11,10 +21,10 @@
  CPPFLAGS+=-DSYSCONFDIR=\"$(SYSCONFDIR)\"
  CPPFLAGS+=-DVERSION=\"${GIT_VERSION}\"
  CFLAGS+=-Iinclude
-@@ -49,18 +49,15 @@
+@@ -56,19 +56,15 @@ OBJS:=$(wildcard src/*.c *.c)
  OBJS:=$(OBJS:.c=.o)
  
- src/%.o: src/%.c
+ src/%.o: src/%.c include/i3status.h
 -	@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 -	@echo " CC $<"
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
@@ -29,7 +39,8 @@
  i3status: ${OBJS}
 -	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 -	@echo " LD $@"
+-
 +	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
  clean:
  	rm -f *.o src/*.o
+ 
diff --git a/i3status-2.7.tar.bz2 b/i3status-2.7.tar.bz2
new file mode 100644
index 0000000..b39b5c8
--- /dev/null
+++ b/i3status-2.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:073f4e5de3bc5afc1f23c52ea52e2aa4b90ca8a012f28ba2c5fac3c33474a632
+size 37594
diff --git a/i3status.changes b/i3status.changes
index c615ef7..6f4383d 100644
--- a/i3status.changes
+++ b/i3status.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Thu Mar 14 08:52:47 UTC 2013 - toganm@opensuse.org
+
+- Update to 2.7 version
+  * Skip a day in the Discordian calendar when St. Tib's Day has
+    passed
+  * colors: Handle down wireless interfaces just like ethernet
+    interfaces
+  * temperature: introduce max_threshold
+  * battery: colorize output even without discharge rate
+  * ddate: Reduce the season day to 0-9 to properly print ordinal
+    suffixes
+  * add good, degraded and bad colors per module
+  * config: introduce an utf-8 character so that editors are forced
+    to use utf-8
+  * ddate: Teen ordinal numbers always use a 'th' suffix.
+  * make SIGUSR1 do nothing, so that killall -USR1 i3status will
+    force an update
+  * changing volume color from bad to degraded if muted
+  * make refreshs align with minutes
+  * wifi: properly display ad-hoc networks
+  * Bugfix: output auto detect: properly detect ambiguous situations
+  * Add tztime module to support multiple different timezones
+  * battery: add option to show capacity without decimals
+  * Add colorized output for load avg
+  * ipv6: properly handle colors for output_format == xmobar
+  * contrib: fix premature insetion of status message into JSON
+
+- Spec file cleanup
+  * rebased i3status-makefile.patch and renamed as
+    i3status-2.7-makefile.patch
+
 -------------------------------------------------------------------
 Sat Nov 24 18:39:30 CET 2012 - pascal.bleser@opensuse.org
 
diff --git a/i3status.spec b/i3status.spec
index 503867c..b3c91ac 100644
--- a/i3status.spec
+++ b/i3status.spec
@@ -1,5 +1,8 @@
 # vim: set sw=4 ts=4 et nu:
-
+#
+# spec file for package i3status
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -12,28 +15,23 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
-Name:               i3status
-Version:            2.6
-Release:            0
-Summary:            I3 Status Bar
-Source:             http://i3wm.org/i3status/i3status-%{version}.tar.bz2
-Patch1:             i3status-makefile.patch
-URL:                http://i3wm.org/i3status/
-Group:              System/Monitoring
-License:            BSD-3-Clause
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
-BuildRequires:      alsa-devel
-%if 0%{?suse_version} >= 1140
-BuildRequires:      libiw-devel
-%else
-BuildRequires:      wireless-tools
-%endif
-BuildRequires:      libyajl-devel
-BuildRequires:      libconfuse-devel
-BuildRequires:      gcc make glibc-devel pkgconfig
-BuildRequires:      autoconf automake libtool
-BuildRequires:      update-desktop-files
+
+Name:           i3status
+Version:        2.7
+Release:        0
+Summary:        I3 Status Bar
+License:        BSD-3-Clause
+Group:          System/Monitoring
+Source:         http://i3wm.org/i3status/i3status-%{version}.tar.bz2
+Patch1:         i3status-2.7-makefile.patch
+Url:            http://i3wm.org/i3status/
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  alsa-devel
+BuildRequires:  libconfuse-devel
+BuildRequires:  libiw-devel
+BuildRequires:  libyajl-devel
 
 %description
 i3status is a small program (about 1500 SLOC) for generating a status bar for
@@ -46,8 +44,9 @@ would.
 
 %prep
 %setup -q
-%patch1
+%patch1 -p1
 
+chmod -x contrib/*.*
 %build
 %__make %{?_smp_mflags} \
     OPTFLAGS="%{optflags}" \
@@ -55,14 +54,11 @@ would.
     SYSCONFDIR="%{_sysconfdir}"
 
 %install
-%makeinstall
-
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+%make_install
 
 %files
 %defattr(-,root,root)
-%doc CHANGELOG LICENSE
+%doc CHANGELOG LICENSE contrib/
 %config(noreplace) %{_sysconfdir}/i3status.conf
 %{_bindir}/i3status
 %doc %{_mandir}/man1/i3status.1*