diff --git a/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2 b/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2
index 74b4456..595d44e 100644
--- a/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2
+++ b/0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c567405005b68c29e88c539c53089c9604e10edc79b4f386f05fe09017f25f6e
-size 178618
+oid sha256:9deb2e9dbbcafaacf0faee2da0c149060b31dd1358dd33cca8f191a6aa4a55db
+size 238046
diff --git a/baselibs.conf b/baselibs.conf
index d9f04d5..11afdfa 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,2 @@
 glew
-libGLEW1_6
+libGLEW1_7
diff --git a/es_branch.diff.bz2 b/es_branch.diff.bz2
new file mode 100644
index 0000000..c706287
--- /dev/null
+++ b/es_branch.diff.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f28f61dceceb52f339c684d1fbf58a46142f4a43a3fb020fa47ce0c14c3519b
+size 35809
diff --git a/glew.changes b/glew.changes
index f08d247..f008a16 100644
--- a/glew.changes
+++ b/glew.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 13 14:16:19 UTC 2011 - johannesobermayr@gmx.de
+
+- Update to 1.7.0 and latest git
+- Merge es branch
+
 -------------------------------------------------------------------
 Thu Sep 29 13:20:07 UTC 2011 - coolo@suse.com
 
diff --git a/glew.spec b/glew.spec
index 2e6fcf6..5baa6ed 100644
--- a/glew.spec
+++ b/glew.spec
@@ -18,8 +18,8 @@
 
 
 Name:           glew
-Version:        1.6.0
-Release:        3
+Version:        1.7.0.git20111104.1441
+Release:        1
 License:        BSD3c and GPLv2 and MIT
 Summary:        OpenGL Extension Wrangler Library
 Url:            http://glew.sourceforge.net/
@@ -28,9 +28,10 @@ Source0:        %name.tar.bz2
 Source1:        baselibs.conf
 Patch:          0001-Add-glew.c-glewinfo.c-and-includes.patch.bz2
 Patch1:         dont-strip.diff
+Patch2:         es_branch.diff.bz2
 BuildRequires:  Mesa-devel
 BuildRequires:  pkg-config
-Requires:       libGLEW1_6 >= %version
+Requires:       libGLEW1_7 >= %version
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,11 +41,11 @@ run-time mechanisms for determining which OpenGL extensions are
 supported on the target platform. OpenGL core and extension
 functionality is exposed in a single header file.
 
-%package -n libGLEW1_6
+%package -n libGLEW1_7
 Summary:        OpenGL Extension Wrangler Library
 Group:          System/Libraries
 
-%description -n libGLEW1_6
+%description -n libGLEW1_7
 The OpenGL Extension Wrangler Library (GLEW) is a cross-platform
 open-source C/C++ extension loading library. GLEW provides efficient
 run-time mechanisms for determining which OpenGL extensions are
@@ -66,8 +67,9 @@ functionality is exposed in a single header file.
 
 %prep
 %setup -q -n %name
-%patch -p1
+%patch2 -p1
 %patch1 -p1
+%patch -p1
 
 %build
 make %{?_smp_mflags} POPT="%{optflags}" LIBDIR=%{_libdir} LDFLAGS.EXTRA= STRIP=/bin/true
@@ -81,16 +83,16 @@ chmod +x %{buildroot}%{_libdir}/*.so.*
 %clean
 rm -rf %{buildroot}
 
-%post -n libGLEW1_6 -p /sbin/ldconfig
+%post -n libGLEW1_7 -p /sbin/ldconfig
 
-%postun -n libGLEW1_6 -p /sbin/ldconfig
+%postun -n libGLEW1_7 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc doc/*
 %{_bindir}/*info
 
-%files -n libGLEW1_6
+%files -n libGLEW1_7
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 
diff --git a/glew.tar.bz2 b/glew.tar.bz2
index 93b94e2..af54374 100644
--- a/glew.tar.bz2
+++ b/glew.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02491713be4b64fb1eb083d995b2305eaf206c7e8cff1e5ec445215f790c0e35
-size 117854
+oid sha256:f21459dda45a63635dd4a0f25ae434aa1ef6fb096172c97aa46d868b12393dff
+size 119351