diff --git a/cone-0.84-build.patch b/cone-0.84-build.patch
new file mode 100644
index 0000000..8c1e422
--- /dev/null
+++ b/cone-0.84-build.patch
@@ -0,0 +1,23 @@
+diff -Nur cone-0.84-orig/curses/cursesobject.H cone-0.84/curses/cursesobject.H
+--- cone-0.84-orig/curses/cursesobject.H	2003-05-27 16:09:07.000000000 +0200
++++ cone-0.84/curses/cursesobject.H	2011-11-17 20:27:31.392803554 +0100
+@@ -21,6 +21,7 @@
+ 
+ #include "../curses/curses_config.h"
+ #include <set>
++#include <cstdlib>
+ 
+ class cursesPtrBase {
+ public:
+diff -Nur cone-0.84-orig/libmail/objectmonitor.H cone-0.84/libmail/objectmonitor.H
+--- cone-0.84-orig/libmail/objectmonitor.H	2009-06-27 19:05:35.000000000 +0200
++++ cone-0.84/libmail/objectmonitor.H	2011-11-17 20:28:12.743801021 +0100
+@@ -16,7 +16,7 @@
+ // will return NULL
+ 
+ #include <set>
+-
++#include <cstdlib>
+ #include "namespace.H"
+ 
+ LIBMAIL_START
diff --git a/cone.spec b/cone.spec
index 144dae9..168d721 100644
--- a/cone.spec
+++ b/cone.spec
@@ -3,7 +3,7 @@
 Summary:        CONE mail reader
 Name:           cone
 Version:        0.84
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
 Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
@@ -12,6 +12,8 @@ License:        GPLv3
 Group:          Applications/Internet
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+Patch0: cone-0.84-build.patch
+
 BuildRequires:  aspell-devel libxml2-devel
 BuildRequires:  zlib-devel openssl-devel fam-devel perl
 BuildRequires:  openssl-perl
@@ -27,7 +29,8 @@ CONE is a simple, text-based E-mail reader and writer.
 %package devel
 Group:          Development/Libraries
 Summary:        LibMAIL mail client development library
-Requires:       %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package the header files and library files for developing
@@ -43,6 +46,7 @@ contains a large amount of documentation for CONE.
 
 %prep
 %setup -q
+%patch0 -p1 -b .build
 
 %build
 CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}"
@@ -102,6 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc cone/html
 
 %changelog
+* Thu Nov 17 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 0.84-3
+- Add %%?_isa to -devel base package dep to meet guidelines.
+- Fix FTBFS (#716041).
+- Add -static Provides to -devel package (#609603).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.84-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild