diff --git a/scripts/rfr b/scripts/rfr
index 3bfd0499d..115bb7420 100755
--- a/scripts/rfr
+++ b/scripts/rfr
@@ -44,17 +44,12 @@ to_addr = 'sw-mobile-nvgpu-core <sw-mobile-nvgpu-core@exchange.nvidia.com>'
 
 # Gerrit commit URL formats. These are regular expressions to match the
 # incoming URLs against.
-gr_fmts = [ r'(\d+)',
-            r'http://git-master/r/(\d+)',
-            r'http://git-master/r/#/c/(\d+)/',
-            r'http://git-master.nvidia.com/r/(\d+)',
-            r'http://git-master.nvidia.com/r/#/c/(\d+)/',
-            r'https://git-master/r/(\d+)',
-            r'https://git-master/r/#/c/(\d+)/',
-            r'https://git-master.nvidia.com/r/(\d+)',
-            r'https://git-master.nvidia.com/r/#/c/(\d+)',
-            r'https://git-master.nvidia.com/r/#/c/(\d+)/',
-            r'https://git-master.nvidia.com/r/c/(?:[\w\-_\/]+?)\+/(\d+)' ]
+gr_fmts = [ r'^(\d+)$',
+            r'https?://git-master/r/(\d+)',
+            r'https?://git-master/r/#/c/(\d+)/',
+            r'https?://git-master.nvidia.com/r/(\d+)',
+            r'https?://git-master.nvidia.com/r/#/c/(\d+)/?',
+            r'https?://git-master.nvidia.com/r/c/(?:[\w\-_\/]+?)\+/(\d+)' ]
 
 # The user to use. May be overridden but the default comes from the environment.
 user = os.environ['USER']