diff --git a/.gitignore b/.gitignore
index fb9b4d9..be8af2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ alpine-2.00.tar.bz2
 /re-alpine-2.02.tar.bz2
 /README.fedora
 /re-alpine-2.03.tar.bz2
+/alpine-2.10.clean.tar.lzma
diff --git a/alpine.spec b/alpine.spec
index 24bffda..f5e0beb 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -2,14 +2,17 @@
 
 Summary: powerful, easy to use console email client
 Name: alpine
-Version: 2.03
-Release: 3%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 
 License: ASL 2.0
 Group: Applications/Internet
-URL: http://re-alpine.sourceforge.net/ 
-Source0:  http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2
-Source1:  README.fedora
+# Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ
+#URL: http://re-alpine.sourceforge.net/ 
+#Source0:  http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2
+URL: http://patches.freeiz.com/alpine/info/alpine.html
+Source0: http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-%{version}.clean.tar.lzma
+Source1: README.fedora
 
 
 # Using "Conflicts" instead of Obsoletes because while alpine is substantially
@@ -66,7 +69,7 @@ GNU Build System's autotools.
 
 
 %prep
-%setup -q -n re-alpine-%{version}
+%setup -q -n alpine-%{version}
 
 cp -p %{SOURCE1} .
 
@@ -123,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 15 2013 Paul Wouters <pwouters@redhat.com> - 2.10-1
+- Build from new upstream for 2.10, fixes rhbz#838359
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index b5c5f32..b63ba62 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5b6f93ec7414c2a794480691a3beae24  README.fedora
-566d269d4bd43aba68f377110a6295d5  re-alpine-2.03.tar.bz2
+727a6eaa577857b98ea74fac6ea42a25  alpine-2.10.clean.tar.lzma