diff --git a/.gitignore b/.gitignore
index b92f0c2..8b551b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gtk-doc-1.19.tar.xz
+SOURCES/gtk-doc-1.25.tar.xz
diff --git a/.gtk-doc.metadata b/.gtk-doc.metadata
index 744fdc9..4620397 100644
--- a/.gtk-doc.metadata
+++ b/.gtk-doc.metadata
@@ -1 +1 @@
-bffec0e53e52b4a5e29ec45f413275fc6fb85054 SOURCES/gtk-doc-1.19.tar.xz
+bd93ff19403805b4faddcd86b58a6f338ce1fd6d SOURCES/gtk-doc-1.25.tar.xz
diff --git a/SOURCES/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch b/SOURCES/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
deleted file mode 100644
index 39ebf65..0000000
--- a/SOURCES/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bd2b3769684a7f7ebdee1d32c0fe280ef0e75e86 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Mon, 21 Oct 2013 15:52:08 -0400
-Subject: [PATCH] gtkdoc-mkdb: sort entries in the glossary
-
-The entries in the glossary were in pseudo-random order, varying
-even between gtk-doc runs.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711111
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711112
----
- gtkdoc-mkdb.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
-index e448ed7..faffaf4 100755
---- a/gtkdoc-mkdb.in
-+++ b/gtkdoc-mkdb.in
-@@ -1119,7 +1119,7 @@ $header
-   <title>Annotation Glossary</title>
- EOF
- 
--    foreach my $annotation (keys(%AnnotationsUsed)) {
-+    foreach my $annotation (sort(keys(%AnnotationsUsed))) {
-         if(defined($AnnotationDefinition{$annotation})) {
-             my $def = $AnnotationDefinition{$annotation};
-             my $curletter = uc(substr($annotation,0,1));
--- 
-1.8.3.1
-
diff --git a/SPECS/gtk-doc.spec b/SPECS/gtk-doc.spec
index 9fa920c..1d55ecd 100644
--- a/SPECS/gtk-doc.spec
+++ b/SPECS/gtk-doc.spec
@@ -1,32 +1,30 @@
-Summary: API documentation generation tool for GTK+ and GNOME
-Name: gtk-doc
-Version: 1.19
-Release: 3%{?dist}
-License: GPLv2+ and GFDL
-Group: Development/Tools
-#VCS: git:git://git.gnome.org/gtk-doc
-Source: http://download.gnome.org/sources/gtk-doc/1.18/gtk-doc-%{version}.tar.xz
+%global debug_package %{nil}
 
-# upstream fix
-Patch0: 0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
+Name: gtk-doc
+Version: 1.25
+Release: 1%{?dist}
+Summary: API documentation generation tool for GTK+ and GNOME
 
-BuildArch: noarch
+License: GPLv2+ and GFDL
 URL: http://www.gtk.org/gtk-doc
+Source: http://download.gnome.org/sources/gtk-doc/1.25/gtk-doc-%{version}.tar.xz
 
 BuildRequires: docbook-utils
 BuildRequires: jade
-BuildRequires: libxslt
+BuildRequires: /usr/bin/xsltproc
 BuildRequires: docbook-style-xsl
+%if 0%{?fedora}
+BuildRequires: perl-generators
+%endif
+BuildRequires: perl-Test-Simple
 BuildRequires: python2-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
 BuildRequires: source-highlight
 BuildRequires: yelp-tools
 
-BuildRequires: autoconf automake libtool
-
 # Following are not automatically installed
-Requires: docbook-utils openjade libxslt docbook-style-xsl
+Requires: docbook-utils openjade /usr/bin/xsltproc docbook-style-xsl
 # we are installing an automake macro
 Requires: automake
 # we are installing an sgml catalog
@@ -43,31 +41,44 @@ and GNOME.
 
 %prep
 %setup -q
-%patch0 -p1
+
+%if 0%{?rhel} == 7
+# Lower unnecessarily high perl requirement
+# https://bugzilla.gnome.org/show_bug.cgi?id=773151
+sed -i -e 's/require v5\.18\.0/require v5.16.0/' configure
+%endif
+
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
 
 %build
-#env NOCONFIGURE=1 ./autogen.sh
 %configure
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%make_install
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
 
+%check
+make check
+
 %files
-%defattr(-, root, root,-)
-%doc AUTHORS README doc/* examples COPYING COPYING-DOCS
+%license COPYING COPYING-DOCS
+%doc AUTHORS README doc/* examples
 %{_bindir}/*
 %{_datadir}/aclocal/gtk-doc.m4
 %{_datadir}/gtk-doc/
 %{_datadir}/sgml/gtk-doc/
 %{_datadir}/pkgconfig/gtk-doc.pc
 %{_datadir}/help/*/gtk-doc-manual/
+%{_libdir}/cmake/
 
 %changelog
+* Tue Mar 22 2016 Kalev Lember <klember@redhat.com> - 1.25-1
+- Update to 1.25
+- Resolves: #1386981
+
 * Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.19-3
 - Mass rebuild 2013-12-27