diff --git a/config/postgresql.conf b/config/postgresql.conf
index b6e00f74a..283d3b6c4 100644
--- a/config/postgresql.conf
+++ b/config/postgresql.conf
@@ -115,8 +115,8 @@ shared_buffers = 512MB			# min 128kB
 # per transaction slot, plus lock space (see max_locks_per_transaction).
 # It is not advisable to set max_prepared_transactions nonzero unless you
 # actively intend to use prepared transactions.
-work_mem = 5MB				# min 64kB
-maintenance_work_mem = 512MB		# min 1MB
+work_mem = 64MB				# min 64kB
+maintenance_work_mem = 2GB		# min 1MB
 #max_stack_depth = 2MB			# min 100kB
 
 # - Kernel Resource Usage -
diff --git a/settings.py b/settings.py
index eeaf5033b..0c86c24a2 100644
--- a/settings.py
+++ b/settings.py
@@ -507,7 +507,7 @@ if not DEVELOPMENT:
 # =========
 
 BROKER_BACKEND = "redis"
-BROKER_URL = "redis://%s:6379/0" % REDIS['host']
+BROKER_URL = "redis://%s:6379/4" % REDIS['host']
 CELERY_RESULT_BACKEND = BROKER_URL
 
 # =========
@@ -547,6 +547,7 @@ REDIS_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=0)
 REDIS_STORY_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=1)
 REDIS_ANALYTICS_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=2)
 REDIS_STATISTICS_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=3)
+REDIS_FEED_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=4)
 REDIS_SESSION_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=5)
 
 JAMMIT = jammit.JammitAssets(NEWSBLUR_DIR)
diff --git a/templates/maintenance_off.html b/templates/maintenance_off.html
index b64629634..597d5fb62 100644
--- a/templates/maintenance_off.html
+++ b/templates/maintenance_off.html
@@ -77,7 +77,7 @@
                         <img src="/media/img/logo_512.png" class="logo">
                         <h1>NewsBlur is in <span class="error404">maintenance mode</span></h1>
                         <div class="description">
-                            <p>This will take approximately 5 minutes. I'm upgrading PostgreSQL and re-building indexes for optimum performance. This is in preparation for sharding MongoDB, but is a necessary step. I apologize for the maintenance, but it is Friday night after all and this is the lowest traffic point in the week. Just think about the fact that I'm still at work and will be here until about 11pm PDT tonight. Then again, I love doing this, so that's not exactly a complaint.</p>
+                            <p>This will take approximately 5 minutes. I'm upgrading PostgreSQL and re-building indexes for optimum performance. Tonight's a rough night, but hopefully this will be the last of it.</p>
                             <p>To pass the time, go surf <a href="http://mlkshk.com/popular">MLKSHK's popular page</a>.</p>
                             <p></p>
                         </div>
diff --git a/utils/munin/newsblur_updates.py b/utils/munin/newsblur_updates.py
index d94d5ddd7..e0b0ddac1 100755
--- a/utils/munin/newsblur_updates.py
+++ b/utils/munin/newsblur_updates.py
@@ -26,7 +26,7 @@ class NBMuninGraph(MuninGraph):
         from django.conf import settings
     
         hour_ago = datetime.datetime.utcnow() - datetime.timedelta(hours=1)
-        r = redis.Redis(connection_pool=settings.REDIS_POOL)    
+        r = redis.Redis(connection_pool=settings.REDIS_FEED_POOL)
 
         return {
             'update_queue': Feed.objects.filter(queued_date__gte=hour_ago).count(),