diff --git a/.cvsignore b/.cvsignore
index 34bae87..074ca83 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cmake-2.4.7-RC-10.tar.gz
+cmake-2.4.6.tar.gz
diff --git a/cmake.spec b/cmake.spec
index 9a2ee39..c8b3f44 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.7
-Release:	0.rc10%{?dist}
+Version:	2.4.6
+Release:	4%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -73,8 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Jun 06 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.7-0.rc10
-- Update to 2.4.7-RC-10
+* Wed Jun 27 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.6-4
+- Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR,
+  LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX
 
 * Mon Apr 16 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.6-3
 - Apply patch from upstream CVS to fix .so install permissions (bug #235673)
diff --git a/macros.cmake b/macros.cmake
index 6e06ad0..6d31bf1 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -9,8 +9,13 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %__cmake \\\
+        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
+        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
+        -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
+        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
+        -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON
diff --git a/sources b/sources
index 54424d2..2504278 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90aba1e8b8e44c45c06540a37ef68d0b  cmake-2.4.7-RC-10.tar.gz
+c99c747ad8e9bfb3bef9cca875a52129  cmake-2.4.6.tar.gz