diff --git a/Makefile.am b/Makefile.am
index 87e9fa9..87774d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,9 +70,10 @@ dist-hook:
 dist-sign: dist
 	gpg -b -a $(PACKAGE)-$(VERSION).tar.gz
 
-rpm:
-	make dist
-	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/rpm/SOURCES
-	CFLAGS="-O2 -mcpu=i686" rpm -ba --clean isync.spec
+rpm: dist
+	CFLAGS="-O2 -mtune=core2" rpmbuild --clean -ta $(PACKAGE)-$(VERSION).tar.gz
+
+rpm-ia32: dist
+	CFLAGS="-O2 -m32 -march=i686" rpmbuild --target i686-unknown-linux --clean -ta $(PACKAGE)-$(VERSION).tar.gz
 
 doc_DATA = README TODO NEWS ChangeLog AUTHORS
diff --git a/isync.spec.in b/isync.spec.in
index 80cf299..fa9fb00 100644
--- a/isync.spec.in
+++ b/isync.spec.in
@@ -2,7 +2,7 @@ Summary: Utility to synchronize IMAP mailboxes with local maildir folders
 Name: isync
 Version: @VERSION@
 Release: 1
-Copyright: GPL
+License: GPL
 Group: Applications/Internet
 Source: @PACKAGE@-@VERSION@.tar.gz
 URL: http://@PACKAGE@.sf.net/
@@ -19,7 +19,7 @@ non-permanent internet collection (dIMAP).
 %prep
 %setup
 %build
-./configure --prefix=/usr
+%configure
 
 %install
 rm -rf $RPM_BUILD_ROOT