diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index fe6cd8019..efb23d939 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -1,3 +1,8 @@
+# Additional MIME types that you'd like nginx to handle go in here
+types {
+    text/csv                    csv;
+}
+
 upstream discourse {
   server unix:/var/www/discourse/tmp/sockets/thin.0.sock;
   server unix:/var/www/discourse/tmp/sockets/thin.1.sock;
diff --git a/docs/INSTALL-ubuntu.md b/docs/INSTALL-ubuntu.md
index 71dc67e95..7270b92d5 100644
--- a/docs/INSTALL-ubuntu.md
+++ b/docs/INSTALL-ubuntu.md
@@ -50,6 +50,9 @@ Install necessary packages:
     # Run these commands as your normal login (e.g. "michael")
     sudo apt-get -y install build-essential libssl-dev libyaml-dev git libtool libxslt-dev libxml2-dev libpq-dev gawk curl pngcrush python-software-properties
 
+    # If you're on Ubuntu >= 12.10, change:
+    # python-software-properties to software-properties-common
+
 ## Caching: Redis
 
 Redis is a networked, in memory key-value store cache. Without the Redis caching layer, we'd have to go to the database a lot more often for common information and the site would be slower as a result.