diff --git a/gnome-autogen.diff b/gnome-autogen.diff
deleted file mode 100644
index 7f77462..0000000
--- a/gnome-autogen.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- macros2/gnome-autogen.sh
-+++ macros2/gnome-autogen.sh
-@@ -289,11 +289,12 @@
- 
- case $REQUIRED_AUTOMAKE_VERSION in
-     1.4*) automake_progs="automake-1.4" ;;
--    1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;;
--    1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;;
--    1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9" ;;
--    1.8*) automake_progs="automake-1.8 automake-1.9" ;;
--    1.9*) automake_progs="automake-1.9" ;;
-+    1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-+    1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-+    1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-+    1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10" ;;
-+    1.9*) automake_progs="automake-1.9 automake-1.10" ;;
-+    1.10*) automake_progs="automake-1.10" ;;
- esac
- version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
-     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
diff --git a/gnome-common-2.12.0.tar.bz2 b/gnome-common-2.12.0.tar.bz2
deleted file mode 100644
index f90d73f..0000000
--- a/gnome-common-2.12.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:adee3a981eb7b09291ee4dead5df9317f598b50d8516c7ed1a15a397bbaf51b5
-size 60283
diff --git a/gnome-common-2.18.0.tar.bz2 b/gnome-common-2.18.0.tar.bz2
new file mode 100644
index 0000000..a182e59
--- /dev/null
+++ b/gnome-common-2.18.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b
+size 62628
diff --git a/gnome-common.changes b/gnome-common.changes
index 1023e21..c67284c 100644
--- a/gnome-common.changes
+++ b/gnome-common.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Aug  1 23:28:20 CEST 2007 - maw@suse.de
+
+- Update to version 2.18.0
+- Bugs (bugzilla.gnome.org) fixed: #377185, #360693, #377175,
+  #323868, #343441, #321860, #319496, and #305641.
+- Works with automake 1.10, so drop gnome-autogen.diff.
+
 -------------------------------------------------------------------
 Wed Dec 13 15:31:33 CET 2006 - sbrabec@suse.cz
 
diff --git a/gnome-common.spec b/gnome-common.spec
index 3f58ebe..1adce0f 100644
--- a/gnome-common.spec
+++ b/gnome-common.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-common (Version 2.12.0)
+# spec file for package gnome-common (Version 2.18.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -13,13 +13,13 @@
 Name:           gnome-common
 BuildRequires:  pkg-config
 Summary:        Commonly Used Files for the GNOME 2.x Desktop Platform
-Version:        2.12.0
-Release:        36
-License:        GNU General Public License (GPL)
+Version:        2.18.0
+Release:        1
+License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Autoreqprov:    on
 Source:         %{name}-%{version}.tar.bz2
-Patch:          gnome-autogen.diff
+### Patch:          gnome-autogen.diff
 URL:            http://www.gnome.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArchitectures: noarch
@@ -37,7 +37,7 @@ Authors:
 
 %prep
 %setup -q
-%patch
+### %patch
 
 %build
 autoreconf -f -i
@@ -57,7 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 %{_datadir}/gnome-common
 
-%changelog -n gnome-common
+%changelog
+* Wed Aug 01 2007 - maw@suse.de
+- Update to version 2.18.0
+- Bugs (bugzilla.gnome.org) fixed: #377185, #360693, #377175,
+  [#323868], #343441, #321860, #319496, and #305641.
+- Works with automake 1.10, so drop gnome-autogen.diff.
 * Wed Dec 13 2006 - sbrabec@suse.cz
 - Prefix changed to /usr.
 - Spec file cleanup.