diff --git a/CHANGES.md b/CHANGES.md
index ef0fbcb6f..f4a877fea 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -41,6 +41,7 @@
 - Bookmark icon shown in the open rooms list when `allow_bookmarks` is to `false`.
 - It wasn't possible to add or remove bookmarks via the "Open Rooms" list.
 - #879 Text in links are converted to smileys leading to non-clickable links.
+- #899: Only touch `stamp-npm` if `npm install` was successful
 - #902 `make build` dependends on non-existing files
 
 ## 3.1.1 (2017-07-12)
diff --git a/Makefile b/Makefile
index fbbf3b40d..81eb7d96d 100644
--- a/Makefile
+++ b/Makefile
@@ -100,8 +100,7 @@ release:
 ## Install dependencies
 
 stamp-npm: package.json
-	npm install
-	touch stamp-npm
+	npm install && touch stamp-npm
 
 stamp-bundler: Gemfile
 	mkdir -p .bundle