diff --git a/alembic/script.py b/alembic/script.py
index f8ef960..731d688 100644
--- a/alembic/script.py
+++ b/alembic/script.py
@@ -222,7 +222,7 @@ def _revision_map(self):
     def _rev_path(self, rev_id, message, create_date):
         slug = "_".join(_slug_re.findall(message or "")).lower()
         if len(slug) > 60:
-            slug = slug[:60].rsplit('_', 1)[0]+'_'
+            slug = slug[:60].rsplit('_', 1)[0] + '_'
         filename = "%s.py" % (
             self.file_template % {
                 'rev': rev_id,
diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst
index a9ef46a..5c4584c 100644
--- a/docs/build/changelog.rst
+++ b/docs/build/changelog.rst
@@ -7,6 +7,14 @@ Changelog
     :version: 0.6.1
     :released: no release date
 
+    .. change::
+      :tags: feature
+      :pullreq: bitbucket:12
+
+      Expanded the size of the filenames generated by "revision" to 60 characters,
+      and also split on the word rather than the character; courtesy
+      Frozenball.
+
     .. change::
       :tags: bug
       :tickets: 135
@@ -18,7 +26,7 @@ Changelog
 
     .. change::
       :tags: bug
-      :pullreq: 9
+      :pullreq: bitbucket:9
 
       Fixes to Py3k in-place compatibity regarding output encoding and related;
       the use of the new io.* package introduced some incompatibilities on Py2k.
diff --git a/docs/build/conf.py b/docs/build/conf.py
index 0bff22a..fa5f569 100644
--- a/docs/build/conf.py
+++ b/docs/build/conf.py
@@ -39,6 +39,13 @@
 changelog_render_ticket = "https://bitbucket.org/zzzeek/alembic/issue/%s/"
 changelog_render_pullreq = "https://bitbucket.org/zzzeek/alembic/pull-request/%s"
 
+changelog_render_pullreq = {
+    "bitbucket": "https://bitbucket.org/zzzeek/alembic/pull-request/%s",
+    "default": "https://bitbucket.org/zzzeek/alembic/pull-request/%s",
+    "github": "https://github.com/zzzeek/alembic/pull/%s",
+}
+
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']