diff --git a/reviewboard/scmtools/clearcase.py b/reviewboard/scmtools/clearcase.py
index 844df27b74b6556811694f8ec53fa8343e7cddfe..309cced0df04ef3a01e6da235bbbc90802f4f459 100644
--- a/reviewboard/scmtools/clearcase.py
+++ b/reviewboard/scmtools/clearcase.py
@@ -45,12 +45,12 @@ class ClearCaseTool(SCMTool):
     # This regular expression can extract from extended_path
     # pure system path. It is construct from two main parts.
     # First match everything from beginning of line to first
-    # occurence of /. Second match parts between /main and
+    # occurence of /. Second match parts between @@/main/ and
     # numbers (file version).
     # This patch assume each branch present in extended_path
     # was derived from /main and there is no file or directory
-    # called "main" in path.
-    UNEXTENDED = re.compile(r'^(.+?)/|/?(.+?)/main/?.*?/([0-9]+|CHECKEDOUT)')
+    # called "@@/main/" in path.
+    UNEXTENDED = re.compile(r'^(.+?)/|/?(.+?)@@/main/?.*?/([0-9]+|CHECKEDOUT)')
 
     VIEW_SNAPSHOT, VIEW_DYNAMIC, VIEW_UNKNOWN = range(3)
 
@@ -72,7 +72,7 @@ class ClearCaseTool(SCMTool):
         """Remove ClearCase revision and branch informations from path.
 
         ClearCase paths contain additional informations about branch
-        and file version preceded by @@. This function remove this
+        and file version preceded by @@/main/. This function remove this
         parts from ClearCase path to make it more readable
         For example this function convert extended path::
 
@@ -83,17 +83,15 @@ class ClearCaseTool(SCMTool):
 
             /vobs/comm/network/sntp/src/sntp.c
         """
-        if '@@' not in extended_path:
+        if '@@/main/' not in extended_path:
             return HEAD, extended_path
 
         # Result of regular expression search result is list of tuples. We must
         # flat this to one list. The best way is use list comprehension. b is
-        # first because it frequently occure in tuples. Before that remove @@
-        # from path.
+        # first because it frequently occure in tuples.
         unextended_chunks = [
             b or a
-            for a, b, foo in self.UNEXTENDED.findall(
-                extended_path.replace('@@', ''))
+            for a, b, foo in self.UNEXTENDED.findall(extended_path)
         ]
 
         if sys.platform.startswith('win'):