diff --git a/guile1.changes b/guile1.changes
index 3c5111e..f52004a 100644
--- a/guile1.changes
+++ b/guile1.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 25 09:00:05 UTC 2012 - pgajdos@suse.com
+
+- package /usr/share/aclocal/guile1.m4 (gnucash uses autoreconf)
+  (GUILE_* macros renamed to GUILE1_*)
+
 -------------------------------------------------------------------
 Tue Jan 10 08:40:00 UTC 2012 - pgajdos@suse.com
 
diff --git a/guile1.spec b/guile1.spec
index 064b992..7c97454 100644
--- a/guile1.spec
+++ b/guile1.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package guile
+# spec file for package guile1
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,22 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %define binpref guile1
 Name:           guile1
-BuildRequires:  gc-devel gmp-devel readline-devel pkg-config automake libtool
-License:        LGPL-2.1+
-Group:          Development/Languages/Scheme
+BuildRequires:  automake
+BuildRequires:  gc-devel
+BuildRequires:  gmp-devel
+BuildRequires:  libtool
+BuildRequires:  pkg-config
+BuildRequires:  readline-devel
 Version:        1.8.8
 Release:        0
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+License:        LGPL-2.1+
+Group:          Development/Languages/Scheme
 Url:            http://www.gnu.org/software/guile/
 Source0:        guile-%{version}.tar.bz2
 Patch1:         guile-64bit.patch
 Patch2:         guile-1.6.10-mktemp.patch
 Patch3:         guile-popen-test.patch
 Patch5:         guile-gcc.patch
-BuildRoot:      %{_tmppath}/guile-%{version}-build
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         fileutils sh-utils
 PreReq:         %install_info_prereq
 Conflicts:      slib < 3a5
@@ -41,8 +45,8 @@ C. Guile provides a machine independent execution platform that can be
 linked in as a library when building extensible programs.
 
 %package -n libguile17
-Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+Group:          Development/Languages/Scheme
 
 %description -n libguile17
 This is Guile, a portable, embeddable Scheme implementation written in
@@ -51,8 +55,8 @@ linked in as a library when building extensible programs. This package
 contains the shared libraries.
 
 %package -n libguile-srfi-srfi-1-v-3-3
-Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+Group:          Development/Languages/Scheme
 
 %description -n libguile-srfi-srfi-1-v-3-3
 This is Guile, a portable, embeddable Scheme implementation written in
@@ -61,8 +65,8 @@ linked in as a library when building extensible programs. This package
 contains the shared libraries.
 
 %package -n libguile-srfi-srfi-4-v-3-3
-Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+Group:          Development/Languages/Scheme
 
 %description -n libguile-srfi-srfi-4-v-3-3
 This is Guile, a portable, embeddable Scheme implementation written in
@@ -71,8 +75,8 @@ linked in as a library when building extensible programs. This package
 contains the shared libraries.
 
 %package -n libguile-srfi-srfi-13-14-v-3-3
-Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+Group:          Development/Languages/Scheme
 
 %description -n libguile-srfi-srfi-13-14-v-3-3
 This is Guile, a portable, embeddable Scheme implementation written in
@@ -81,8 +85,8 @@ linked in as a library when building extensible programs. This package
 contains the shared libraries.
 
 %package -n libguile-srfi-srfi-60-v-2-2
-Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+Group:          Development/Languages/Scheme
 
 %description -n libguile-srfi-srfi-60-v-2-2
 This is Guile, a portable, embeddable Scheme implementation written in
@@ -91,8 +95,8 @@ linked in as a library when building extensible programs. This package
 contains the shared libraries.
 
 %package -n libguilereadline-v-17-17
-Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+Group:          Development/Languages/Scheme
 
 %description -n libguilereadline-v-17-17
 This is Guile, a portable, embeddable Scheme implementation written in
@@ -102,8 +106,8 @@ contains the shared libraries.
 
 
 %package -n libguile1-devel
-Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+Group:          Development/Languages/Scheme
 Requires:       libguilereadline-v-17-17 = %{version}-%{release}
 Requires:       libguile-srfi-srfi-60-v-2-2 = %{version}-%{release}
 Requires:       libguile-srfi-srfi-1-v-3-3 = %{version}-%{release}
@@ -146,6 +150,8 @@ Authors:
 sed -i s/-Werror// configure.in configure
 
 %build
+sed -i "s:GUILE_:GUILE1_:" guile-config/guile.m4
+sed -i "s:guile:guile1:" guile-config/guile.m4
 autoreconf -fi
 # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS:
 # gen-scmconfig.c,c-tokenize.c
@@ -161,7 +167,7 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_datadir}/guile/site
 rm -r %{buildroot}%{_infodir}
 # conflict with guile2
-rm %{buildroot}%{_datadir}/aclocal/guile.m4
+mv %{buildroot}%{_datadir}/aclocal/guile{,1}.m4
 # use /usr/bin/guile1 instead of /usr/bin/guile
 sed -i "s:${GUILE-guile}:${GUILE-guile1}:" %{buildroot}%{_datadir}/guile/1.8/scripts/*
 sed -i "s:/usr/bin/guile:/usr/bin/guile1:" %{buildroot}%{_bindir}/guile1-config
@@ -247,5 +253,6 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
 %{_libdir}/libguile*.so
 %{_libdir}/libguile*.la
 %{_libdir}/pkgconfig/*
+%{_datadir}/aclocal/guile1.m4
 
 %changelog