diff --git a/mlpack.spec b/mlpack.spec
index faaa46c..a72f5f8 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -7,23 +7,13 @@ License:        LGPLv3+
 URL:            http://www.mlpack.org
 Source0:        http://www.mlpack.org/files/%{name}-%{version}.tar.gz
 
-# CMake by default doesn't provide support for specifying libdir on install
-# (argh!) and this has to be done by hand in the CMake configuration.
-Patch0:         cmake_libdir.patch
-
 # By default the mlpack Doxyfile excludes all files in the directory pattern
 # */build/*.  Well, on Koji, that's everything.  So we need to not exclude
 # that.
-Patch1:		no_exclude_build.patch
-
-# Newer versions of Doxygen choke on the TreeTraits definitions for some reason.
-Patch2:		doxygen.patch
+Patch0:		no_exclude_build.patch
 
 # Fix OpenMP build.
-Patch3:         omp.patch
-
-# Fix Python installation.
-#Patch4:		cmake_python_fix.patch
+Patch1:         omp.patch
 
 BuildRequires:  gcc-c++
 # Use cmake28 package on RHEL.
@@ -136,9 +126,9 @@ margins.  This package provides the Python bindings for mlpack.
 # On RHEL6, the Boost CMake scripts fail for some reason.  I don't have the
 # time (or patience) to investigate, but if we force CMake to find Boost "the
 # hard way" by specifying Boost_NO_BOOST_CMAKE=1, it works.
-%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) .
+%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) .
 %else
-%{cmake} -D LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) .
+%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) .
 %endif
 
 # Try and reduce RAM usage.