diff --git a/.gitignore b/.gitignore
index c1f8404..d721205 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /cppo-1.1.2.tar.gz
 /v1.4.0.tar.gz
 /v1.5.0.tar.gz
+/v1.6.4.tar.gz
diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec
index 3aa2143..e972791 100644
--- a/ocaml-cppo.spec
+++ b/ocaml-cppo.spec
@@ -4,8 +4,8 @@
 %endif
 
 Name:           ocaml-cppo
-Version:        1.5.0
-Release:        8%{?dist}
+Version:        1.6.4
+Release:        1%{?dist}
 Summary:        Equivalent of the C preprocessor for OCaml programs
 
 License:        BSD
@@ -17,6 +17,7 @@ BuildRequires:  ocaml-findlib
 %if !%{opt}
 Requires:       ocaml >= 3.10.0
 %endif
+BuildRequires:  jbuilder
 
 %define libname %(sed -e 's/^ocaml-//' <<< %{name})
 
@@ -43,16 +44,12 @@ sed -i.add-debuginfo \
 
 
 %build
-%if %opt
-make %{?_smp_mflags} opt
-%else
 make %{?_smp_mflags} all
-%endif
 
 
 %install
 %{__install} -d $RPM_BUILD_ROOT%{_bindir}
-%{__install} -p cppo $RPM_BUILD_ROOT%{_bindir}/
+%{__install} -p _build/install/default/bin/cppo $RPM_BUILD_ROOT%{_bindir}/
 
 
 %check
@@ -60,11 +57,15 @@ make test
 
 
 %files
-%doc LICENSE README.md Changes
+%license LICENSE.md
+%doc Changes README.md
 %{_bindir}/cppo
 
 
 %changelog
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.6.4-1
+- New upstream version 1.6.4.
+
 * Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-8
 - OCaml 4.07.0-rc1 rebuild.
 
diff --git a/sources b/sources
index 3f57190..c22b611 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.5.0.tar.gz) = 2cc144815b818242b6bb1dee213aa65345620eaf1afe59b25d118399d9a02d577aa9dc61dd5756661e44411acccdb2fc0320a8984e5f0d2a7390fcc816bac7e0
+SHA512 (v1.6.4.tar.gz) = 89c6df66d597d929be7532ad82f0206b028bdbd79a0b4b39451bce3fa5bd63a80dce931d575f69bd7066de829347498c736657dfe9610b20700a652b9b542a4d