diff --git a/.bowerrc b/.bowerrc
index 3f8ac64455..93896b8083 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-    "directory" : "assets"
+    "directory" : "tmp-assets"
 }
diff --git a/.gitignore b/.gitignore
index bac93debc9..19dc866ed1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@ composer.phar
 behat.yml
 /datas
 /www/assets
-/assets
+/tmp-assets
diff --git a/Gruntfile.js b/Gruntfile.js
index a1f443a90f..e856211b42 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,7 +2,7 @@ module.exports = function(grunt) {
     grunt.initConfig({
         "pkg": grunt.file.readJSON("package.json"),
         "path": {
-            "bower": "assets",
+            "bower": "tmp-assets",
             "asset": "www/assets"
         },
         mocha_phantomjs: {