diff --git a/modules/PathUtils.js b/modules/PathUtils.js
index b65edf875d..34c57ba9c3 100644
--- a/modules/PathUtils.js
+++ b/modules/PathUtils.js
@@ -3,7 +3,7 @@ var invariant = require('react/lib/invariant');
 var assign = require('object-assign');
 var qs = require('qs');
 
-var queryMatcher = /\?(.*)$/;
+var queryMatcher = /\?([\s\S]*)$/;
 
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -25,7 +25,7 @@ function _compilePattern(pattern) {
       escapedSource += '([^/?#]+)';
       paramNames.push(match[1]);
     } else if (match[0] === '*') {
-      escapedSource += '(.*?)';
+      escapedSource += '([\\s\\S]*?)';
       paramNames.push('splat');
     } else if (match[0] === '(') {
       escapedSource += '(?:';
diff --git a/modules/__tests__/PathUtils-test.js b/modules/__tests__/PathUtils-test.js
index cd6c7a638a..4ff8742fd4 100644
--- a/modules/__tests__/PathUtils-test.js
+++ b/modules/__tests__/PathUtils-test.js
@@ -130,6 +130,7 @@ describe('PathUtils.extractParams', function () {
         expect(PathUtils.extractParams('/files/*', '/files/my/photo.jpg')).toEqual({ splat: 'my/photo.jpg' });
         expect(PathUtils.extractParams('/files/*', '/files/my/photo.jpg.zip')).toEqual({ splat: 'my/photo.jpg.zip' });
         expect(PathUtils.extractParams('/files/*.jpg', '/files/my/photo.jpg')).toEqual({ splat: 'my/photo' });
+        expect(PathUtils.extractParams('/files/*.jpg', '/files/my/new\nline.jpg')).toEqual({ splat: 'my/new\nline' });
       });
     });
 
@@ -287,6 +288,20 @@ describe('PathUtils.extractQuery', function () {
     it('properly handles encoded ampersands', function () {
       expect(PathUtils.extractQuery('/?id=a%26b')).toEqual({ id: 'a&b' });
     });
+
+    it('properly handles raw newlines', function () {
+      expect(PathUtils.extractQuery('/?id=a\nb')).toEqual({ id: 'a\nb' });
+      expect(PathUtils.extractQuery('/?id=a\rb')).toEqual({ id: 'a\rb' });
+      expect(PathUtils.extractQuery('/?id=a\r\nb')).toEqual({ id: 'a\r\nb' });
+      expect(PathUtils.extractQuery('/?id=a\n\rb')).toEqual({ id: 'a\n\rb' });
+    });
+
+    it('properly handles encoded newlines', function () {
+      expect(PathUtils.extractQuery('/?id=a%0Ab')).toEqual({ id: 'a\nb' });
+      expect(PathUtils.extractQuery('/?id=a%0Db')).toEqual({ id: 'a\rb' });
+      expect(PathUtils.extractQuery('/?id=a%0D%0Ab')).toEqual({ id: 'a\r\nb' });
+      expect(PathUtils.extractQuery('/?id=a%0A%0Db')).toEqual({ id: 'a\n\rb' });
+    });
   });
 
   describe('when the path does not contain a query string', function () {