diff --git a/.gitignore b/.gitignore
index 601aaa1..2b27b12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /graphite2-1.3.10.tgz
+/graphite2-1.3.13.tgz
diff --git a/graphite-arm-nodefaultlibs.patch b/graphite-arm-nodefaultlibs.patch
index 98ea4a0..626af6e 100644
--- a/graphite-arm-nodefaultlibs.patch
+++ b/graphite-arm-nodefaultlibs.patch
@@ -1,16 +1,16 @@
 --- graphite2-1.2.0/src/CMakeLists.txt.orig     2012-11-09 17:48:04.908391335 +0800
 +++ graphite2-1.2.0/src/CMakeLists.txt  2012-11-09 17:48:48.647102280 +0800
-@@ -118,11 +118,7 @@
+@@ -120,11 +120,7 @@
      if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
          target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
      else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
--        if (GRAPHITE2_ASAN)
+-        if (GRAPHITE2_SANITIZERS)
 -            target_link_libraries(graphite2 c gcc_s)
--        else (GRAPHITE2_ASAN)
+-        else ()
 -            target_link_libraries(graphite2 c gcc)
--        endif (GRAPHITE2_ASAN)
-+        target_link_libraries(graphite2 c gcc_s)
-         include(Graphite)
-         nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
-     endif (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+-        endif ()
++	target_link_libraries(graphite2 c gcc_s)
+     endif()
+     include(Graphite)
+     if (BUILD_SHARED_LIBS)
 
diff --git a/graphite2.spec b/graphite2.spec
index 9b8c681..67d46a2 100644
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -1,6 +1,6 @@
 Name:           graphite2
-Version:        1.3.10
-Release:        8%{?dist}
+Version:        1.3.13
+Release:        1%{?dist}
 Summary:        Font rendering capabilities for complex non-Roman writing systems
 
 License:        (LGPLv2+ or GPLv2+ or MPL) and (Netscape or GPLv2+ or LGPLv2+)
@@ -14,10 +14,8 @@ BuildRequires:  gcc-c++
 BuildRequires:  cmake
 BuildRequires:  freetype-devel
 BuildRequires:  doxygen asciidoc
-BuildRequires:  python-unversioned-command
-BuildRequires:  texlive-helvetic texlive-sectsty texlive-tocloft texlive-xtab texlive-multirow python2-fonttools
-
-Obsoletes:      silgraphite < 2.3.1-5
+BuildRequires:  texlive-helvetic texlive-sectsty texlive-tocloft texlive-xtab texlive-multirow
+BuildRequires:  python3-fonttools
 
 %description
 Graphite2 is a project within SIL’s Non-Roman Script Initiative and Language
@@ -31,25 +29,21 @@ system implementation.
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: Files for developing with graphite2
 
-Obsoletes: silgraphite-devel < 2.3.1-5
-
 %description devel
 Includes and definitions for developing with graphite2.
 
 %prep
-%setup -q
-%patch0 -p1 -b .arm
-%patch1 -p1 -b .cmake
+%autosetup -p1
 
 %build
 %cmake -DGRAPHITE2_COMPARE_RENDERER=OFF  .
-make %{?_smp_mflags}
+%{make_build}
 make docs
 sed -i -e 's!<a id="id[a-z]*[0-9]*"></a>!!g' doc/manual.html
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+%{make_install}
+find %{buildroot} -type f -name "*.la" -delete
 
 %check
 ctest
@@ -61,7 +55,7 @@ ctest
 %doc ChangeLog README.md
 %{_bindir}/gr2fonttest
 %{_libdir}/libgraphite2.so.3
-%{_libdir}/libgraphite2.so.3.0.1
+%{_libdir}/libgraphite2.so.3.2.1
 
 %files devel
 %doc doc/manual.html
@@ -73,6 +67,11 @@ ctest
 %{_libdir}/pkgconfig/graphite2.pc
 
 %changelog
+* Thu Aug 22 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.3.13-1
+- New upstream 1.3.13 release
+- Move to python3 for tests
+- Fix CVE-2018-7999 (rhbz 1554383)
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index fbe33cc..8abeb85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (graphite2-1.3.10.tgz) = d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
+SHA512 (graphite2-1.3.13.tgz) = 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131