diff --git a/.gitignore b/.gitignore
index 4252037..2461014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pan-0.133.tar.bz2
 /pan-0.137.tar.bz2
 /pan-0.138.tar.bz2
 /pan-0.139.tar.bz2
+/pan-0.140.tar.bz2
diff --git a/pan.spec b/pan.spec
index 77fd356..577bb9b 100644
--- a/pan.spec
+++ b/pan.spec
@@ -1,11 +1,15 @@
+%define checkout .20160114git
+
 Summary:	A GNOME/GTK+ newsreader for X
 Name:		pan
-Version:	0.139
-Release:	11%{?dist}
+Version:	0.140
+Release:	0.1%{?checkout}%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		Applications/Internet
-Source0:	http://pan.rebelbase.com/download/releases/%{version}/source/%{name}-%{version}.tar.bz2
+# The source for this package was pulled from upstream's vcs:
+# git://git.gnome.org/pan2
+Source0:	%{name}-%{version}.tar.bz2
 URL:		http://pan.rebelbase.com/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
@@ -16,6 +20,7 @@ BuildRequires:	gmime-devel >= 2.5.5
 BuildRequires:	gtk2-devel  >= 2.16.0
 BuildRequires:	gtkspell-devel >= 2.0.7
 BuildRequires:	enchant-devel >= 1.6.0
+BuildRequires:	libappstream-glib
 BuildRequires:	libnotify-devel >= 0.4.1
 BuildRequires:	libgnome-keyring-devel >= 3.2.0
 # In the past, we could not link GPLv2-only Pan with GnuTLS due to libgnutls being effectively LGPLv3+
@@ -37,6 +42,15 @@ Seal of Approval evaluations.
 sed -i -e 's|StartupNotify=false|StartupNotify=true|' %{name}.desktop.in
 
 %build
+
+# This workaround is required due to Pan still using the old ABI:
+# http://developerblog.redhat.com/2015/02/05/gcc5-and-the-c11-abi/
+# Related bug:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1279195
+%if 0%{?fedora} > 22
+export CXXFLAGS="%{optflags} -D_GLIBCXX_USE_CXX11_ABI=0"
+%endif
+
 %configure --without-gtk3 --with-gnutls \
     --with-dbus --with-gmime-crypto \
     --with-gtkspell --enable-libnotify \
@@ -48,28 +62,29 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-install -d $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \
---add-category=Application \
---add-category=Network \
---dir=$RPM_BUILD_ROOT%{_datadir}/applications \
---copy-name-to-generic-name \
---delete-original
-
 %find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
+%check
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Wed Dec  2 2015 Tom Callaway <spot@fedoraproject.org> - 1:0.139-11
+* Thu Jan 14 2016 Petr Kovar <pkovar@redhat.com> - 1:0.140-0.1.20160114git
+- Update to latest git snapshot
+- Use -D_GLIBCXX_USE_CXX11_ABI=0
+- Add appdata file
+- Use desktop-file-validate instead of desktop-file-install
+
+* Wed Dec 02 2015 Tom Callaway <spot@fedoraproject.org> - 1:0.139-11
 - enable build with GnuTLS (bz 999582)
 
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.139-10
diff --git a/sources b/sources
index 11c53c1..9e8cea6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2466a64d4cec19f8ab4f6a58d38b3367  pan-0.139.tar.bz2
+823c524d7fe759dd07784ac8c9d2e534  pan-0.140.tar.bz2