diff --git a/BasiliskII/BasiliskII.spec b/BasiliskII/BasiliskII.spec
index bae68fa6..291de26c 100644
--- a/BasiliskII/BasiliskII.spec
+++ b/BasiliskII/BasiliskII.spec
@@ -1,16 +1,16 @@
 %define name BasiliskII
-%define version 1.0
+%define version 1.0rc1
 %define release 1
 
 Summary: 68k Macintosh emulator
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Copyright: GPL
+License: GPL
 Group: Applications/Emulators
-Source: %{name}_src_15012002.tar.gz
+Source0: %{name}_src_30062005.tar.gz
 URL: http://www.uni-mainz.de/~bauec002/B2Main.html
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # While the data file path (/usr/share/BasiliskII) is compiled into the
 # executable, the data files are not required for operation and their location
@@ -47,22 +47,13 @@ Some features of Basilisk II:
 
 %build
 cd src/Unix
-CFLAGS=${RPM_OPT_FLAGS} CXXFLAGS=${RPM_OPT_FLAGS} ./configure --prefix=%{_prefix} --mandir=%{_mandir}
-if [ -x /usr/bin/getconf ] ; then
-  NCPU=$(/usr/bin/getconf _NPROCESSORS_ONLN)
-  if [ $NCPU -eq 0 ] ; then
-    NCPU=1
-  fi
-else  
-  NCPU=1
-fi
-(make -k -j $NCPU; exit 0)
+%configure
 make
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 cd src/Unix
-make DESTDIR=${RPM_BUILD_ROOT} install
+%makeinstall
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
diff --git a/BasiliskII/Makefile b/BasiliskII/Makefile
index 869420f2..d13e26f6 100644
--- a/BasiliskII/Makefile
+++ b/BasiliskII/Makefile
@@ -57,7 +57,7 @@ $(SRCARCHIVE): $(SRCS) $(DOCS)
 # RPMs (source and binary)
 #
 rpm: $(SRCARCHIVE)
-	rpm -ta --clean $(SRCARCHIVE)
+	rpmbuild -ta --clean $(SRCARCHIVE)
 
 #
 # Binary archive for AmigaOS
diff --git a/BasiliskII/README b/BasiliskII/README
index 8424db4d..8bce5216 100644
--- a/BasiliskII/README
+++ b/BasiliskII/README
@@ -2,7 +2,7 @@
   Basilisk II
   A 68k Macintosh emulator
 
-  Copyright (C) 1997-2004 Christian Bauer et al.
+  Copyright (C) 1997-2005 Christian Bauer et al.
 
 
 License