diff --git a/roles/modernpaste/files/modern-paste.conf b/roles/modernpaste/files/modern-paste.conf
index e811aa1d45..529ea895ca 100644
--- a/roles/modernpaste/files/modern-paste.conf
+++ b/roles/modernpaste/files/modern-paste.conf
@@ -7,8 +7,15 @@ RewriteCond %{HTTP_USER_AGENT} ^fpaste\/0\.3.*$ [OR]
 RewriteCond %{HTTP_USER_AGENT} ^Python\-urllib.*$
 RewriteCond %{REQUEST_METHOD} POST
 RewriteRule ^/$ /stickynotes2modernpaste/$1 [L,PT]
+
+RewriteCond %{HTTP_USER_AGENT} ^fpaste\/0\.3.*$ [OR]
+RewriteCond %{HTTP_USER_AGENT} ^Python\-urllib.*$
+RewriteCond %{REQUEST_METHOD} POST
 RewriteRule ^/(.*)=/$ /stickynotes2modernpaste/$1= [L,PT]
 
+# Otherwise, if we're given a URL with a trailing slash, kill it.
+RewriteRule ^/(.*)=/$ /$1= [R,L]
+
 WSGIScriptAlias / /usr/share/modern-paste/modern_paste.wsgi
 
 <Directory /usr/share/stickynotes2modernpaste>