diff --git a/.gitignore b/.gitignore
index 84de027..d4a213c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@
 /node-v6.2.2-stripped.tar.gz
 /node-v6.3.0-stripped.tar.gz
 /node-v6.3.1-stripped.tar.gz
+/node-v6.4.0-stripped.tar.gz
diff --git a/nodejs.spec b/nodejs.spec
index dca7ba8..0b315da 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -12,8 +12,8 @@
 # feature releases that are only supported for nine months, which is shorter
 # than a Fedora release lifecycle.
 %global nodejs_major 6
-%global nodejs_minor 3
-%global nodejs_patch 1
+%global nodejs_minor 4
+%global nodejs_patch 0
 %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
 %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
 
@@ -22,7 +22,7 @@
 %global v8_major 5
 %global v8_minor 0
 %global v8_build 71
-%global v8_patch 57
+%global v8_patch 60
 # V8 presently breaks ABI at least every x.y release while never bumping SONAME
 %global v8_abi %{v8_major}.%{v8_minor}
 %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch}
@@ -41,6 +41,7 @@
 
 # punycode - from lib/punycode.js
 # Note: this was merged into the mainline since 0.6.x
+# Note: this will be unmerged in v7 or v8
 %global punycode_major 2
 %global punycode_minor 0
 %global punycode_patch 0
@@ -62,7 +63,7 @@ Name: nodejs
 Epoch: 1
 Version: %{nodejs_version}
 # Keep this release > 100 for F25+ due to a complicated npm upgrade bug
-Release: 101%{?dist}
+Release: 1%{?dist}
 Summary: JavaScript runtime
 License: MIT and ASL 2.0 and ISC and BSD
 Group: Development/Languages
@@ -371,6 +372,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
 %{_pkgdocdir}/npm/doc
 
 %changelog
+* Thu Aug 18 2016 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:6.4.0-1
+- Update to 6.4.0
+
 * Tue Aug 16 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.3.1-101
 - Build Node.js with internationalization support
 
diff --git a/sources b/sources
index 4cd663c..3991a87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-676f94f9f3dcb702071b5057074a3cb8  node-v6.3.1-stripped.tar.gz
+f1a51f14113d15f78c669f2975baec80  node-v6.4.0-stripped.tar.gz