diff --git a/cmake-2.8.4.tar.bz2 b/cmake-2.8.4.tar.bz2
deleted file mode 100644
index 2f6e2aa..0000000
--- a/cmake-2.8.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5465a243dce5a6e140a5ce49bf2b5bb07e78eee10310597abac0669c638c053f
-size 4181332
diff --git a/cmake-2.8.5.tar.gz b/cmake-2.8.5.tar.gz
new file mode 100644
index 0000000..5afeb90
--- /dev/null
+++ b/cmake-2.8.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91
+size 5517977
diff --git a/cmake-gui.changes b/cmake-gui.changes
index 99bb20e..24c52c3 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 29 16:19:45 UTC 2011 - puzel@novell.com
+
+- update to 2.8.5 
+ - see /usr/share/doc/packages/cmake/Changelog for changes
+
 -------------------------------------------------------------------
 Thu Nov 11 11:09:03 UTC 2010 - puzel@novell.com
 
diff --git a/cmake-gui.spec b/cmake-gui.spec
index cd7398a..b678395 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -19,12 +19,12 @@
 
 
 Name:           cmake-gui
-Version:        2.8.4
+Version:        2.8.5
 Release:        1
 License:        BSD3c
 Group:          Development/Tools/Building
 Url:            http://www.cmake.org/
-Source0:        cmake-%{version}.tar.bz2
+Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz
 Patch4:         cmake-disable-builtin-chrpath.diff
 Summary:        CMake graphical user interface
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -39,10 +39,12 @@ BuildRequires:  expat-devel
 BuildRequires:  curl-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libqt4-devel
-BuildRequires:  libarchive-devel
 BuildRequires:  openssl-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
+%if 0%{?suse_version} > 1130
+BuildRequires:  libarchive-devel
+%endif
 Requires:       cmake
 
 %description
@@ -67,7 +69,15 @@ export CFLAGS="$CXXFLAGS"
     --datadir=/share/cmake \
     --docdir=/share/doc/packages/cmake \
     --mandir=/share/man \
+%if 0%{?suse_version} > 1130
     --system-libs \
+%else
+    --system-curl \
+    --system-expat \
+    --system-zlib \
+    --system-bzip2 \
+    --no-system-libarchive \
+%endif
     --parallel=0%jobs \
     --qt-gui
 make VERBOSE=1 %{?jobs:-j %jobs}
diff --git a/cmake.changes b/cmake.changes
index 74f4956..7b5398f 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jul 29 16:19:27 UTC 2011 - puzel@novell.com
+
+- update to 2.8.5 
+ - see /usr/share/doc/packages/cmake/Changelog for changes
+
+-------------------------------------------------------------------
+Tue Apr  5 10:49:54 UTC 2011 - puzel@novell.com
+
+- use --no-system-libarchive for openSUSE < 11.3 
+
 -------------------------------------------------------------------
 Mon Apr  4 14:17:43 UTC 2011 - puzel@novell.com
 
diff --git a/cmake.spec b/cmake.spec
index 9650aa7..d152366 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -19,12 +19,12 @@
 
 
 Name:           cmake
-Version:        2.8.4
+Version:        2.8.5
 Release:        1
 License:        BSD3c
 Group:          Development/Tools/Building
 Url:            http://www.cmake.org/
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 Patch4:         cmake-disable-builtin-chrpath.diff
 # Should appear in cmake-2.8.3
 Summary:        Cross-platform, open-source make system
@@ -39,10 +39,12 @@ BuildRequires:  expat-devel
 %endif
 BuildRequires:  curl-devel
 BuildRequires:  gcc-c++
-BuildRequires:  libarchive-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
+%if 0%{?suse_version} > 1130
+BuildRequires:  libarchive-devel
+%endif
 Requires:       make
 
 %description
@@ -64,7 +66,15 @@ export CFLAGS="$CXXFLAGS"
     --datadir=/share/%{name} \
     --docdir=/share/doc/packages/%{name} \
     --mandir=/share/man \
+%if 0%{?suse_version} > 1130
     --system-libs \
+%else
+    --system-curl \
+    --system-expat \
+    --system-zlib \
+    --system-bzip2 \
+    --no-system-libarchive \
+%endif
     --parallel=0%jobs \
     --no-qt-gui
 make VERBOSE=1 %{?jobs:-j %jobs}