diff --git a/.gitignore b/.gitignore
index 31fc5ab..d99aa54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pango-1.36.8.tar.xz
+SOURCES/pango-1.40.4.tar.xz
diff --git a/.pango.metadata b/.pango.metadata
index b88165c..1c5dd61 100644
--- a/.pango.metadata
+++ b/.pango.metadata
@@ -1 +1 @@
-c6ba02ee8f9d8b22b7cfd74c4b6ae170bebc8d2b SOURCES/pango-1.36.8.tar.xz
+761458faab28cb70ba62e01ec9379d03bc5339c0 SOURCES/pango-1.40.4.tar.xz
diff --git a/SPECS/pango.spec b/SPECS/pango.spec
index 0d63a48..78e7e94 100644
--- a/SPECS/pango.spec
+++ b/SPECS/pango.spec
@@ -2,30 +2,29 @@
 %global pkgconfig_version 0.12
 %global freetype_version 2.1.5
 %global fontconfig_version 2.10.91
-%global cairo_version 1.7.6
+%global cairo_version 1.12.10
 %global libthai_version 0.1.9
-%global harfbuzz_version 0.9.9
-%global bin_version 1.8.0
+%global harfbuzz_version 1.0.3
+%global libXft_version 2.0.0
 
-Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.36.8
-Release: 2%{?dist}
+Version: 1.40.4
+Release: 1%{?dist}
+Summary: System for layout and rendering of internationalized text
+
 License: LGPLv2+
-Group: System Environment/Libraries
-#VCS: git:git://git.gnome.org/pango
-Source: http://download.gnome.org/sources/pango/1.36/pango-%{version}.tar.xz
 URL: http://www.pango.org
+Source0: http://download.gnome.org/sources/%{name}/1.40/%{name}-%{version}.tar.xz
 
-BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pkgconfig >= %{pkgconfig_version}
-BuildRequires: freetype-devel >= %{freetype_version}
-BuildRequires: fontconfig-devel >= %{fontconfig_version}
-BuildRequires: libXft-devel
-BuildRequires: cairo-devel >= %{cairo_version}
-BuildRequires: libthai-devel >= %{libthai_version}
-BuildRequires: harfbuzz-devel >= %{harfbuzz_version}
-BuildRequires: gobject-introspection-devel
+BuildRequires: pkgconfig(cairo) >= %{cairo_version}
+BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
+BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(fontconfig) >= %{fontconfig_version}
+BuildRequires: pkgconfig(harfbuzz) >= %{harfbuzz_version}
+BuildRequires: pkgconfig(libthai) >= %{libthai_version}
+BuildRequires: pkgconfig(xft) >= %{libXft_version}
+BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: cairo-gobject-devel
 # Bootstrap requirements
 BuildRequires: gnome-common intltool gtk-doc
@@ -35,7 +34,9 @@ Requires: glib2%{?_isa} >= %{glib2_version}
 Requires: freetype%{?_isa} >= %{freetype_version}
 Requires: fontconfig%{?_isa} >= %{fontconfig_version}
 Requires: cairo%{?_isa} >= %{cairo_version}
+Requires: harfbuzz%{?_isa} >= %{harfbuzz_version}
 Requires: libthai%{?_isa} >= %{libthai_version}
+Requires: libXft%{?_isa} >= %{libXft_version}
 
 %description
 Pango is a library for laying out and rendering of text, with an emphasis
@@ -51,7 +52,6 @@ quality text handling and graphics rendering.
 
 %package devel
 Summary: Development files for pango
-Group: Development/Libraries
 Requires: pango%{?_isa} = %{version}-%{release}
 Requires: glib2-devel%{?_isa} >= %{glib2_version}
 Requires: freetype-devel%{?_isa} >= %{freetype_version}
@@ -64,7 +64,6 @@ for the pango package.
 
 %package tests
 Summary: Tests for the %{name} package
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description tests
@@ -84,19 +83,16 @@ rm pango-view/pango-view.1.in
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
  %configure $CONFIGFLAGS \
           --enable-doc-cross-references \
-          --with-included-modules=basic-fc \
           --enable-installed-tests
 )
 make %{?_smp_mflags} V=1
 
 
 %install
-
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%make_install
 
 # Remove files that should not be packaged
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/pango/*/modules/*.la
 
 PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so
 if ! test -e $PANGOXFT_SO; then
@@ -105,38 +101,19 @@ if ! test -e $PANGOXFT_SO; then
         exit 1
 fi
 
-# We need to have separate 32-bit and 64-bit pango-querymodules binaries
-# for places where we have two copies of the Pango libraries installed.
-# (we might have x86_64 and i686 packages on the same system, for example.)
-mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-%{__isa_bits}
-
-# and add a man page too
-echo ".so man1/pango-querymodules.1" > $RPM_BUILD_ROOT%{_mandir}/man1/pango-querymodules-%{__isa_bits}.1
-
-touch $RPM_BUILD_ROOT%{_libdir}/pango/%{bin_version}/modules.cache
-
 %post
 /sbin/ldconfig
-/usr/bin/pango-querymodules-%{__isa_bits} --update-cache || :
 
 %postun
 /sbin/ldconfig
-if test $1 -gt 0; then
-  /usr/bin/pango-querymodules-%{__isa_bits} --update-cache || :
-fi
 
 %files
-%doc README AUTHORS COPYING NEWS
+%license COPYING
+%doc README AUTHORS NEWS
 %doc pango-view/HELLO.txt
 %{_libdir}/libpango*-*.so.*
-%{_bindir}/pango-querymodules*
 %{_bindir}/pango-view
-%{_mandir}/man1/pango-view.1.gz
-%{_mandir}/man1/pango-querymodules*
-%dir %{_libdir}/pango
-%dir %{_libdir}/pango/%{bin_version}
-%{_libdir}/pango/%{bin_version}/modules
-%ghost %{_libdir}/pango/%{bin_version}/modules.cache
+%{_mandir}/man1/pango-view.1*
 %{_libdir}/girepository-1.0/Pango-1.0.typelib
 %{_libdir}/girepository-1.0/PangoCairo-1.0.typelib
 %{_libdir}/girepository-1.0/PangoFT2-1.0.typelib
@@ -160,6 +137,14 @@ fi
 
 
 %changelog
+* Mon Feb 27 2017 Kalev Lember <klember@redhat.com> - 1.40.4-1
+- Update to 1.40.4
+- Resolves: #1387032
+
+* Tue Sep 13 2016 Kalev Lember <klember@redhat.com> - 1.40.3-1
+- Update to 1.40.3
+- Resolves: #1387032
+
 * Thu May 14 2015 Matthias Clasen <mclasen@redhat.com> - 1.36.8-2
 - Regenerate man page for pango-view
 - Related: #1174436