diff --git a/Dockerfile b/Dockerfile
index 76fa18eae..d792c30c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # DESCRIPTION:    Image to build Atom and create a .rpm file
 
 # Base docker image
-FROM fedora:20
+FROM fedora:21
 
 # Install dependencies
 RUN yum install -y \
@@ -12,11 +12,11 @@ RUN yum install -y \
     glibc-devel \
     git-core \
     libgnome-keyring-devel \
-    rpmdevtools
+    rpmdevtools \
+    nodejs \
+    npm
 
-# Install node
-RUN curl -sL https://rpm.nodesource.com/setup | bash -
-RUN yum install -y nodejs
+RUN npm install -g npm@1.4.28 --loglevel error
 
 ADD . /atom
 WORKDIR /atom
diff --git a/script/utils/verify-requirements.js b/script/utils/verify-requirements.js
index 554c27dd0..890172753 100644
--- a/script/utils/verify-requirements.js
+++ b/script/utils/verify-requirements.js
@@ -57,7 +57,7 @@ function verifyNpm(cb) {
     var npmMajorVersion = +versionArray[0] || 0;
     var npmMinorVersion = +versionArray[1] || 0;
     if (npmMajorVersion === 1 && npmMinorVersion < 4)
-      cb("npm v1.4+ is required to build Atom.");
+      cb("npm v1.4+ is required to build Atom. Version " + npmVersion + " was detected.");
     else
       cb(null, "npm: v" + npmVersion);
   });