diff --git a/.gitignore b/.gitignore
index b373bda..c0292fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ uncrustify-0.56.tar.gz
 /uncrustify-0.58.tar.gz
 /uncrustify-0.60.tar.gz
 /uncrustify-0.62.tar.gz
+/uncrustify-0.64.tar.gz
diff --git a/sources b/sources
index 8bbfd97..b8ce1ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fee7ed42a9530a5d7e259d703601161f  uncrustify-0.62.tar.gz
+008904ca40d07c4b3d66c717d59cb65b  uncrustify-0.64.tar.gz
diff --git a/uncrustify.spec b/uncrustify.spec
index a208cfc..4610edf 100644
--- a/uncrustify.spec
+++ b/uncrustify.spec
@@ -1,5 +1,5 @@
 Name:		uncrustify
-Version:	0.62
+Version:	0.64
 Release:	1%{?dist}
 Summary:	Reformat Source
 
@@ -7,35 +7,36 @@ Group:		Development/Tools
 License:	GPLv2
 URL:		http://uncrustify.sourceforge.net/
 Source0:	https://prdownloads.sourceforge.net/uncrustify/uncrustify-%{version}.tar.gz
-BuildRequires:	gcc gcc-c++ libstdc++
+BuildRequires:	gcc gcc-c++ libstdc++ cmake
 
 %description
 Source Code Beautifier for C, C++, C#, D, Java, and Pawn
 
 %prep
-%setup -q
+%autosetup -c
 
 %build
-%configure --disable-silent-rules
+mkdir build && cd build
+%cmake ..
 make %{?_smp_mflags}
 
 
 %install
+cd build
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-install -m644 man/uncrustify.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 
 
 %files
-# FIXME: https://github.com/uncrustify/uncrustify/issues/468
-%doc COPYING AUTHORS NEWS
+%doc COPYING AUTHORS NEWS README.md
 %doc documentation
 %{_bindir}/uncrustify
-%{_datadir}/uncrustify
 %{_mandir}/man1/uncrustify.1*
 
 
 %changelog
+* Sat Oct 15 2016 Michael Catanzaro <mcatanzaro@gnome.org> - 0.64-1
+- Update to 0.64
+
 * Sat Mar 26 2016 Michael Catanzaro <mcatanzaro@gnome.org> - 0.62-1
 - Update to 0.62