diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..55228ea6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+total-conversion-build.user.js
diff --git a/README.md b/README.md
index 423fe251..bf76d0a0 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ Install
 Contributing
 ------------
 
-Please do!
+Please do! 
 
 (Obviously, Resistance folks must send in complete patches while Enlightenment gals and guys may just open feature request ☺)
 
@@ -90,7 +90,7 @@ Contributors
 Hacking
 -------
 
-Execute `./build.rb` or `./build.py` to effectively concatenate `main.js` with all the files in `code/`. It generates the user script which may be installed into your browser.
+Execute `./build.rb` or `./build.py` to effectively concatenate `main.js` with all the files in `code/`. It generates the user script which may be installed into your browser. Do not modify `total-conversion-build.user.js` manually, because it is automatically generated. Please don’t include it in patches either, because it makes merging harder. Instead, modify the files in `code/` and have that file built for you.
 
 `style.css` contains most styles required for the user-script. The extra ones can be found in `code/boot.js#window.setupStyles`. Only CSS rules that depend on config variables should be defined there.