diff --git a/.cvsignore b/.cvsignore
index d9b5c7a..f371501 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lwp-2.5.tar.gz
+lwp-2.6.tar.gz
diff --git a/lwp-2.5-no-longjmp_chk.patch b/lwp-2.5-no-longjmp_chk.patch
deleted file mode 100644
index 1d98e5d..0000000
--- a/lwp-2.5-no-longjmp_chk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur lwp-2.5/src/lwp_ucontext.h lwp-2.5-new/src/lwp_ucontext.h
---- lwp-2.5/src/lwp_ucontext.h	2008-12-09 15:13:12.000000000 -0500
-+++ lwp-2.5-new/src/lwp_ucontext.h	2009-08-20 12:58:41.333733985 -0400
-@@ -21,7 +21,17 @@
- #include <config.h>
- #endif
- 
-+/* work around longjmp_chk */
-+#ifdef __USE_FORTIFY_LEVEL
-+#define LWP_SAVE_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
-+#undef __USE_FORTIFY_LEVEL
- #include <setjmp.h>
-+#define __USE_FORTIFY_LEVEL LWP_SAVE_USE_FORTIFY_LEVEL
-+#undef LWP_SAVE_USE_FORTIFY_LEVEL
-+#else
-+#include <setjmp.h>
-+#endif
-+
- #include <signal.h>
- #include "lwp_stacktrace.h"
- 
diff --git a/lwp-2.6-no-longjmp_chk.patch b/lwp-2.6-no-longjmp_chk.patch
new file mode 100644
index 0000000..c05ce7c
--- /dev/null
+++ b/lwp-2.6-no-longjmp_chk.patch
@@ -0,0 +1,34 @@
+diff -ur lwp-2.6~/src/lwp_ucontext.c lwp-2.6/src/lwp_ucontext.c
+--- lwp-2.6~/src/lwp_ucontext.c	2010-03-17 16:32:51.000000000 -0400
++++ lwp-2.6/src/lwp_ucontext.c	2010-04-01 11:38:55.495718223 -0400
+@@ -21,9 +21,6 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-/* avoid breaking longjmp stack switching */
+-#undef _FORTIFY_SOURCE
+-#define _FORTIFY_SOURCE 0
+ #include "lwp_ucontext.h"
+ 
+ /* Some architectures have a stack that grows up instead of down */
+diff -ur lwp-2.6~/src/lwp_ucontext.h lwp-2.6/src/lwp_ucontext.h
+--- lwp-2.6~/src/lwp_ucontext.h	2008-12-09 15:13:12.000000000 -0500
++++ lwp-2.6/src/lwp_ucontext.h	2010-04-01 11:38:36.160841037 -0400
+@@ -21,7 +21,17 @@
+ #include <config.h>
+ #endif
+ 
++/* work around longjmp_chk */
++#ifdef __USE_FORTIFY_LEVEL
++#define LWP_SAVE_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
++#undef __USE_FORTIFY_LEVEL
+ #include <setjmp.h>
++#define __USE_FORTIFY_LEVEL LWP_SAVE_USE_FORTIFY_LEVEL
++#undef LWP_SAVE_USE_FORTIFY_LEVEL
++#else
++#include <setjmp.h>
++#endif
++
+ #include <signal.h>
+ #include "lwp_stacktrace.h"
+ 
diff --git a/lwp.spec b/lwp.spec
index 6f36b6a..7d4697d 100644
--- a/lwp.spec
+++ b/lwp.spec
@@ -1,14 +1,12 @@
 Name:           lwp
-Version:        2.5
-Release:        3%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        C library for user-mode threading
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.coda.cs.cmu.edu/
 Source0:        ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Patch0:         lwp-2.5-no-longjmp_chk.patch
+Patch0:         lwp-2.6-no-longjmp_chk.patch
 
 %description
 The LWP userspace threads library. The LWP threads library is used by the Coda
@@ -28,7 +26,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .no-longjmp_chk
+%patch -P 0 -p1
 
 
 %build
@@ -37,7 +35,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -60,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING NEWS README
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
@@ -68,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr  1 2010 Adam Goode <adam@spicenitz.org> - 2.6-1
+- New upstream release
+  + Fix fortify failure whenever a new thread is started (not really)
+  + ARM thumb2 assembly fix
+- Update longjmp patch, upstream is not quite right yet
+
 * Thu Aug 20 2009 Adam Goode <adam@spicenitz.org> - 2.5-3
 - Add check to specfile
 - Patch around lwp's creative use of longjmp that fails with fortify
diff --git a/sources b/sources
index bdb7bfc..a4e350b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cd784683bd672973897c22eab790038  lwp-2.5.tar.gz
+65ba6faddf2c9741d4a481b0e9661a34  lwp-2.6.tar.gz