diff --git a/reviewboard/hostingsvcs/github.py b/reviewboard/hostingsvcs/github.py
index 61e61a77defbff5397b74e03bbe4a0dc122cf0d8..03484424a4cbe979a8f313407c8dad0fbdb4a65e 100644
--- a/reviewboard/hostingsvcs/github.py
+++ b/reviewboard/hostingsvcs/github.py
@@ -633,16 +633,16 @@ class GitHub(HostingService):
         tree = self.client.api_get(url)
 
         file_shas = {}
-        for file in tree['tree']:
-            file_shas[file['path']] = file['sha']
+        for f in tree['tree']:
+            file_shas[f['path']] = f['sha']
 
         diff = []
 
-        for file in files:
-            filename = file['filename']
-            status = file['status']
+        for f in files:
+            filename = f['filename']
+            status = f['status']
             try:
-                patch = file['patch']
+                patch = f['patch']
             except KeyError:
                 continue
 
@@ -650,12 +650,12 @@ class GitHub(HostingService):
 
             if status == 'modified':
                 old_sha = file_shas[filename]
-                new_sha = file['sha']
+                new_sha = f['sha']
                 diff.append('index %s..%s 100644' % (old_sha, new_sha))
                 diff.append('--- a/%s' % filename)
                 diff.append('+++ b/%s' % filename)
             elif status == 'added':
-                new_sha = file['sha']
+                new_sha = f['sha']
 
                 diff.append('new file mode 100644')
                 diff.append('index %s..%s' % ('0' * 40, new_sha))
@@ -668,6 +668,16 @@ class GitHub(HostingService):
                 diff.append('index %s..%s' % (old_sha, '0' * 40))
                 diff.append('--- a/%s' % filename)
                 diff.append('+++ /dev/null')
+            elif status == 'renamed':
+                old_filename = f['previous_filename']
+                old_sha = file_shas[old_filename]
+                new_sha = f['sha']
+
+                diff.append('rename from %s' % old_filename)
+                diff.append('rename to %s' % filename)
+                diff.append('index %s..%s' % (old_sha, new_sha))
+                diff.append('--- a/%s' % old_filename)
+                diff.append('+++ b/%s' % filename)
 
             diff.append(patch)
 
diff --git a/reviewboard/hostingsvcs/tests.py b/reviewboard/hostingsvcs/tests.py
index 21d26d428de066b79527bc7b3bc2cff323f5f918..8c3a4f7b1faf313812722aa4c4a3c1170bb16e0a 100644
--- a/reviewboard/hostingsvcs/tests.py
+++ b/reviewboard/hostingsvcs/tests.py
@@ -1859,7 +1859,18 @@ class GitHubTests(ServiceTests):
                          /****************************************************************************
                           * Issue Summary"""),
                 },
-            ]
+                {
+                    'sha': '17ba0791499db908433b80f37c5fbc89b870084b',
+                    'filename': 'new_filename',
+                    'previous_filename': 'old_filename',
+                    'status': 'renamed',
+                    'patch': dedent('''\
+                        @@ -1,1 +1,1 @@
+                        - foo
+                        + bar
+                    ''')
+                },
+            ],
         })
 
         trees_api_response = json.dumps({
@@ -1872,6 +1883,10 @@ class GitHubTests(ServiceTests):
                     'path': 'reviewboard/static/rb/css/reviews.less',
                     'sha': '535cd2c4211038d1bb8ab6beaed504e0db9d7e62',
                 },
+                {
+                    'path': 'old_filename',
+                    'sha': '356a192b7913b04c54574d18c28d46e6395428ab',
+                }
             ],
         })
 
@@ -1927,7 +1942,7 @@ class GitHubTests(ServiceTests):
 
         self.assertEqual(change.message, 'Move .clearfix to defs.less')
         self.assertEqual(md5(change.diff.encode('utf-8')).hexdigest(),
-                         '5f63bd4f1cd8c4d8b46f2f72ea8d33bc')
+                         '2e928c77c0bf703960eb49f04e76bc11')
 
     def test_get_change_exception(self):
         """Testing GitHub get_change exception types"""