diff --git a/.gitignore b/.gitignore
index bfd5704..2cfb7eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gnome-common-3.7.4.tar.xz
+SOURCES/gnome-common-3.18.0.tar.xz
diff --git a/.gnome-common.metadata b/.gnome-common.metadata
index b829a54..19c5ec1 100644
--- a/.gnome-common.metadata
+++ b/.gnome-common.metadata
@@ -1 +1 @@
-b02cd66b73d3ded795f187f725be150ee08f13ac SOURCES/gnome-common-3.7.4.tar.xz
+332e514961374a54dc065b86032eaeb03d6d3cee SOURCES/gnome-common-3.18.0.tar.xz
diff --git a/SPECS/gnome-common.spec b/SPECS/gnome-common.spec
index 5f1b5f5..07638bd 100644
--- a/SPECS/gnome-common.spec
+++ b/SPECS/gnome-common.spec
@@ -1,51 +1,52 @@
 Name:           gnome-common
-Version:        3.7.4
-Release:        4%{?dist}
-Summary:        Useful things common to building gnome packages from scratch
-
+Version:        3.18.0
+Release:        1%{?dist}
+Summary:        Useful things common to building GNOME packages from scratch
 Group:          Development/Tools
 BuildArch:      noarch
 License:        GPLv2+
-URL:            http://developer.gnome.org
-Source0:        http://download.gnome.org/sources/%{name}/3.7/%{name}-%{version}.tar.xz
-
+URL:            https://wiki.gnome.org/Projects/GnomeCommon
+Source0:        https://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz
 # This will pull in the latest version; if your package requires something older,
 # well, BuildRequire it in that spec.  At least until such time as we have a
 # build system that is intelligent enough to inspect your source code
 # and auto-inject those requirements.
-Requires: automake
-Requires: autoconf
-Requires: libtool
-Requires: gettext
-Requires: pkgconfig
+Requires:       automake
+Requires:       autoconf
+Requires:       autoconf-archive
+Requires:       gettext
+Requires:       libtool
+Requires:       pkgconfig
+Requires:       yelp-tools
 
 %description
 This package contains sample files that should be used to develop pretty much
 every GNOME application.  The programs included here are not needed for running
-gnome apps or building ones from distributed tarballs.  They are only useful
-for compiling from CVS sources or when developing the build infrastructure for
+GNOME apps or building ones from distributed tarballs.  They are only useful
+for compiling from git sources or when developing the build infrastructure for
 a GNOME application.
 
 %prep
 %setup -q
 
 %build
-%configure
+%configure --with-autoconf-archive
 make %{?_smp_mflags}
-cp doc-build/README doc-README
-# No sense making a doc subdir in the rpm pkg for one file.
-cp doc/usage.txt usage.txt
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 
 %files
-%doc doc-README usage.txt ChangeLog
-%{_bindir}/*
+%doc ChangeLog README
+%license COPYING
+%{_bindir}/gnome-autogen.sh
 %{_datadir}/aclocal/*
-%{_datadir}/%{name}
 
 %changelog
+* Fri Sep 30 2016 Kalev Lember <klember@redhat.com> - 3.18.0-1
+- Update to 3.18.0
+- Resolves: #1386884
+
 * Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 3.7.4-4
 - Mass rebuild 2013-12-27