diff --git a/.travis.yml b/.travis.yml
index f179189a..30b19356 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,12 @@ env:
   - GEM_HOME=/var/lib/gems/1.8
 
 before_install:
+  - sudo add-apt-repository -y ppa:chris-lea/node.js
   - sudo apt-get update
 
 install:
-  - sudo apt-get -y install nodejs npm rubygems python-babel
+  - sudo apt-get -y install nodejs rubygems python-babel
   - sudo gem install compass
-    # 'npm config set ca ""' required only for node 0.6
-    # which is installed on Travis CI
-    # see https://github.com/npm/npm/issues/4379#issuecomment-31590254
-  - sudo npm config set ca ""
   - sudo npm install -g po2json
   - sudo npm install -g autoprefixer
 
diff --git a/Makefile b/Makefile
index d3b68cd7..4cfa6dbb 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,9 @@ assets: styles javascript
 
 styles: SASSFLAGS = --style=expanded
 styles:
-		cp -r $(CURDIR)/src/styles/libs/font-awesome/fonts/ $(CURDIR)/static/fonts/
+		mkdir -p $(CURDIR)/static/css
+		mkdir -p $(CURDIR)/static/fonts
+		cp -r $(CURDIR)/src/styles/libs/font-awesome/fonts/font* $(CURDIR)/static/fonts
 		sass --compass --scss $(SASSFLAGS) \
 			$(CURDIR)/src/styles/main.scss:$(CURDIR)/static/css/main.min.css
 		autoprefixer --browsers $(AUTOPREFIXER_BROWSER_SUPPORT) $(CURDIR)/static/css/main.min.css
@@ -138,7 +140,8 @@ install:
 clean:
 		GOPATH=$(GOPATH) go clean -i $(PKG)
 		rm -rf $(CURDIR)/pkg
-		rm -f $(CURDIR)/static/css/main.min.css
+		rm -rf $(CURDIR)/static/css
+		rm -rf $(CURDIR)/static/fonts
 		rm -rf $(CURDIR)/build/out
 
 distclean: clean
diff --git a/README.md b/README.md
index da9bb38b..bf7dd7df 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The latest version of Spreed Speak Freely can be found on GitHub:
 ## Build prerequisites
 
   - [Go](http://golang.org) >= 1.1.0
-  - [NodeJS](http://nodejs.org/)
+  - [NodeJS](http://nodejs.org/) >= 0.8.0
   - [Sass](http://sass-lang.com/) >= 3.2.0
   - [Compass](http://compass-style.org/)
   - [Babel](http://babel.pocoo.org/)