diff --git a/.gitignore b/.gitignore
index 6579744..c73bef2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ gtk+-2.90.5.tar.bz2
 /gtk+-3.1.6.tar.xz
 /gtk+-3.1.8.tar.xz
 /gtk+-3.1.10.tar.xz
+/gtk+-3.1.18.tar.xz
diff --git a/gtk3.spec b/gtk3.spec
index 085a942..9f9f344 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -9,7 +9,7 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
-Version: 3.1.10
+Version: 3.1.18
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -64,7 +64,7 @@ This package contains version 3 of GTK+.
 %package immodules
 Summary: Input methods for GTK+
 Group: System Environment/Libraries
-Requires: gtk3 = %{version}-%{release}
+Requires: gtk3%{?_isa} = %{version}-%{release}
 # for /etc/X11/xinit/xinput.d
 Requires: imsettings
 
@@ -75,7 +75,7 @@ are shipped as part of GTK+ 3.
 %package immodule-xim
 Summary: XIM support for GTK+
 Group: System Environment/Libraries
-Requires: gtk3 = %{version}-%{release}
+Requires: gtk3%{?_isa} = %{version}-%{release}
 
 %description immodule-xim
 The gtk3-immodule-xim package contains XIM support for GTK+ 3.
@@ -182,7 +182,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 
 %files -f gtk30.lang
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gtk-query-immodules-3.0*
 %{_libdir}/libgtk-3.so.*
@@ -208,7 +207,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 
 %files immodules
-%defattr(-, root, root, -)
 %{_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.so
 %{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.so
 %{_libdir}/gtk-3.0/%{bin_version}/immodules/im-inuktitut.so
@@ -221,11 +219,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %config(noreplace) %{_sysconfdir}/gtk-3.0/im-multipress.conf
 
 %files immodule-xim
-%defattr(-, root, root, -)
 %{_libdir}/gtk-3.0/%{bin_version}/immodules/im-xim.so
 
 %files devel -f gtk30-properties.lang
-%defattr(-, root, root, -)
 %{_libdir}/lib*.so
 %{_includedir}/*
 %{_datadir}/aclocal/*
@@ -235,10 +231,12 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_datadir}/gir-1.0
 
 %files devel-docs
-%defattr(-, root, root, -)
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Sep  5 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.18-1
+- Update to 3.1.18
+
 * Sat Jul 23 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.10-1
 - Update to 3.1.10
 
diff --git a/sources b/sources
index fffa26c..26c55cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-825920f74ebe15dfa0c012f5b2dd87f9  gtk+-3.1.10.tar.xz
+eb08145c837d213a16cb12047e8bc675  gtk+-3.1.18.tar.xz