diff --git a/.cvsignore b/.cvsignore
index 4d1f4be..f186e56 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-automoc-1.0.20080527svn811390.tar.gz
+automoc4-0.9.84.tar.bz2
diff --git a/automoc-1.0-lib64.patch b/automoc-1.0-lib64.patch
deleted file mode 100644
index 5f72519..0000000
--- a/automoc-1.0-lib64.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up automoc-1.0/CMakeLists.txt.lib64 automoc-1.0/CMakeLists.txt
---- automoc-1.0/CMakeLists.txt.lib64	2008-05-27 12:01:53.000000000 -0500
-+++ automoc-1.0/CMakeLists.txt	2008-05-28 11:24:05.000000000 -0500
-@@ -17,4 +17,4 @@ set_target_properties(automoc4  PROPERTI
- target_link_libraries(automoc4 ${QT_QTCORE_LIBRARY})
- 
- install(TARGETS automoc4 DESTINATION bin)
--install(FILES Automoc4Config.cmake automoc4.files.in  DESTINATION  lib/automoc4)
-+install(FILES Automoc4Config.cmake automoc4.files.in  DESTINATION  lib${LIB_SUFFIX}/automoc4)
diff --git a/automoc.spec b/automoc.spec
index 99a9d99..d5d619d 100644
--- a/automoc.spec
+++ b/automoc.spec
@@ -1,16 +1,18 @@
-%define snaptag .20080527svn811390
+#define snaptag .20080527svn811390
+%define beta 0.9.84
+%define beta_tag rc1 
 
 Name:           automoc
 Version:        1.0
-Release:        0.3%{?snaptag}%{?dist}
+Release:        0.8.%{?beta_tag}%{?dist}
 Summary:        KDE4 automoc
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.kde.org
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/4.0.94/support/automoc4-%{beta}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        http://rpm.binaryhelix.net/SOURCES/%{name}-%{version}%{?snaptag}.tar.gz
-Patch0:         automoc-1.0-lib64.patch
+Provides: automoc4 = %{beta}
 
 Requires:       cmake
 BuildRequires:  cmake qt4-devel kde-filesystem
@@ -20,8 +22,7 @@ KDE4 automoc
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .lib64
+%setup -q -n automoc4-%{beta}
 
 
 %build
@@ -30,21 +31,12 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} VERBOSE=1 -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
-# Put things in proper places
-# Put Automoc4Config.cmake in proper place
-%{__mkdir} -p %{buildroot}%{_datadir}/cmake/Modules
-%{__mv} %{buildroot}%{_libdir}/automoc4/Automoc4Config.cmake \
-	%{buildroot}%{_datadir}/cmake/Modules/Automoc4Config.cmake
-# Remove automoc4.files.in (and /usr/lib, since it's not needed)
-%{__rm} -rf %{buildroot}%{_libdir}
-
-
 
 
 %clean
@@ -53,13 +45,22 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc automoc4.files.in
 %{_bindir}/automoc4
-%{_datadir}/cmake/Modules/Automoc4Config.cmake
-
+%{_prefix}/lib/automoc4/
 
 
 %changelog
+* Wed Jul 23 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0-0.8.rc1
+- automoc4-0.9.84 (1.0-rc1)
+
+* Mon Jun 30 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0-0.7.beta2
+- automoc4-0.9.83 (1.0-beta2)
+- drop lib64 patch
+
+* Thu Jun 10 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 1.0-0.5.20080527svn811390
+- Leave automoc4.files.in in _libdir
+- Same applies to Automoc4Config.cmake
+
 * Thu May 29 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 1.0-0.3.20080527svn811390
 - Added 'cmake' to Requires
 
diff --git a/sources b/sources
index aee0495..9688614 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-577b4c8ac4e9ebce24d57af26b1cb337  automoc-1.0.20080527svn811390.tar.gz
+6e1167594b8edd0fd2156aad75b4b2b0  automoc4-0.9.84.tar.bz2