diff --git a/.gitignore b/.gitignore
index e415edf..30f48fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libaccounts-glib-0.45.tar.gz
 /libaccounts-glib-1.8.tar.gz
 /libaccounts-glib-1.16.tar.gz
+/libaccounts-glib-1.18.tar.gz
diff --git a/libaccounts-glib-1.16-build-with-werror.patch b/libaccounts-glib-1.16-build-with-werror.patch
deleted file mode 100644
index 6517084..0000000
--- a/libaccounts-glib-1.16-build-with-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libaccounts-glib/ag-provider.c b/libaccounts-glib/ag-provider.c
-index 426cb2c..187614b 100644
---- a/libaccounts-glib/ag-provider.c
-+++ b/libaccounts-glib/ag-provider.c
-@@ -441,7 +441,7 @@ ag_provider_get_plugin_name (AgProvider *provider)
- gboolean
- ag_provider_get_single_account (AgProvider *provider)
- {
--    g_return_val_if_fail (provider != NULL, NULL);
-+    g_return_val_if_fail (provider != NULL, FALSE);
-     return provider->single_account;
- }
- 
diff --git a/libaccounts-glib.spec b/libaccounts-glib.spec
index f01d062..1a0e9bc 100644
--- a/libaccounts-glib.spec
+++ b/libaccounts-glib.spec
@@ -1,12 +1,15 @@
 Name:		libaccounts-glib
-Version:	1.16
-Release:	4%{?dist}
+Version:	1.18
+Release:	1%{?dist}
 Group:		System Environment/Libraries
 Summary:	Accounts framework for Linux and POSIX based platforms
 License:	LGPLv2
 URL:		https://code.google.com/p/accounts-sso/
-Source0:	https://accounts-sso.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:		libaccounts-glib-1.16-build-with-werror.patch
+
+# Source available from https://drive.google.com/drive/#folders/0B8fX9XOwH_g4alFsYV8tZTI4VjQ
+# as per https://groups.google.com/forum/#!topic/accounts-sso-announce/8MserPgUV5M
+Source0:	%{name}-%{version}.tar.gz
+
 BuildRequires:	dbus-glib-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	sqlite-devel
@@ -39,8 +42,6 @@ The %{name}-docs package contains documentation for %{name}.
 %prep
 %setup -q
 
-%patch0	-p1 -b .werror
-
 %build
 gtkdocize
 autoreconf -i --force
@@ -67,8 +68,8 @@ rm -rf %{buildroot}%{_datadir}/libaccounts-glib0-test
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS INSTALL ChangeLog README NEWS
+%license COPYING
+%doc AUTHORS INSTALL ChangeLog README NEWS
 %{_bindir}/ag-backup
 %{_bindir}/ag-tool
 %{_mandir}/man1/ag-backup.1.gz
@@ -100,6 +101,12 @@ rm -rf %{buildroot}%{_datadir}/libaccounts-glib0-test
 %doc %{_datadir}/gtk-doc/html/libaccounts-glib/
 
 %changelog
+* Thu Mar 26 2015 Daniel Vrátil <dvratil@redhat.com> - 1.18-1
+- update to 1.18
+- update upstream source URL
+- use %%license
+- drop upstreamed patch
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 8e818ec..bab06c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cdb46354885a8973bccd05090360361  libaccounts-glib-1.16.tar.gz
+fa37ebbe1cc1e8b738368ba86142c197  libaccounts-glib-1.18.tar.gz