diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java
index b25f1753f75..98c5d47ff84 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java
@@ -21,6 +21,7 @@
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2019, Chris Ross <cross@distal.com>.
  * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
+ * Portions Copyright (c) 2020, Chris Quick <gtoph00@gmail.com>.
  */
 
 package org.opengrok.indexer.history;
@@ -53,7 +54,7 @@
 class PerforceHistoryParser {
     private static final Logger LOGGER = LoggerFactory.getLogger(PerforceHistoryParser.class);
 
-    private static final Pattern FILENAME_PATTERN = Pattern.compile("//[^/]+/(.+)");
+    private static final Pattern FILENAME_PATTERN = Pattern.compile("^//[^/]+/(.+)");
 
     private static final String PAT_P4_DATE_TIME_BY =
             "on (\\d{4})/(\\d{2})/(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2}) by ([^@]+)";
@@ -122,7 +123,7 @@ private History parseDirectory(File file, String sinceRevision) throws IOExcepti
         cmd.clear();
         cmd.add(repo.RepoCommand);
         cmd.add("filelog");
-        cmd.add("-ti");
+        cmd.add("-sti");
         cmd.add(directorySpec);
         executor = new Executor(cmd, file);
         executor.exec();
@@ -141,7 +142,7 @@ History getRevisions(File file, String sinceRevision) throws IOException {
         ArrayList<String> cmd = new ArrayList<>();
         cmd.add(repo.RepoCommand);
         cmd.add("filelog");
-        cmd.add("-lti");
+        cmd.add("-slti");
         cmd.add(protectPerforceFilename(file.getName()) + asRevisionSuffix(sinceRevision));
 
         Executor executor = new Executor(cmd, file.getParentFile());