diff --git a/services/web/public/js/libs/bib-log-parser.js b/services/web/public/js/libs/bib-log-parser.js
index 6e93111b27..712b67971b 100644
--- a/services/web/public/js/libs/bib-log-parser.js
+++ b/services/web/public/js/libs/bib-log-parser.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 1.10.0
 define(function() {
-  var BibLogParser, LINE_SPLITTER_REGEX, MESSAGE_LEVELS;
+  var BibLogParser, LINE_SPLITTER_REGEX, MESSAGE_LEVELS, MULTILINE_ERROR_REGEX, MULTILINE_WARNING_REGEX, SINGLELINE_WARNING_REGEX, consume;
   LINE_SPLITTER_REGEX = /^\[(\d+)].*>\s(INFO|WARN|ERROR)\s-\s(.*)$/;
   MESSAGE_LEVELS = {
     "INFO": "info",
@@ -15,8 +15,78 @@ define(function() {
     this.options = options || {};
     this.lines = text.split('\n');
   };
+  consume = function(logText, regex, process) {
+    var iterationCount, match, newEntry, re, result, text;
+    text = logText;
+    result = [];
+    re = regex;
+    iterationCount = 0;
+    while (match = re.exec(text)) {
+      iterationCount += 1;
+      if (iterationCount >= 10000) {
+        return result;
+      }
+      newEntry = process(match);
+      result.push(newEntry);
+      text = (match.input.slice(0, match.index)) + (match.input.slice(match.index + match[0].length + 1, match.input.length));
+    }
+    return [result, text];
+  };
+  MULTILINE_WARNING_REGEX = /^Warning--(.+)\n--line (\d+) of file (.+)$/m;
+  SINGLELINE_WARNING_REGEX = /^Warning--(.+)$/m;
+  MULTILINE_ERROR_REGEX = /^(.*)---line (\d+) of file (.*)\n([^]+?)\nI'm skipping whatever remains of this entry$/m;
   (function() {
-    return this.parse = function() {
+    this.parseBibtex = function() {
+      var multiLineErrors, multiLineWarnings, ref, ref1, ref2, remainingText, result, singleLineWarnings;
+      result = {
+        all: [],
+        errors: [],
+        warnings: [],
+        files: [],
+        typesetting: []
+      };
+      ref = consume(this.text, MULTILINE_WARNING_REGEX, function(match) {
+        var fileName, fullMatch, lineNumber, message;
+        fullMatch = match[0], message = match[1], lineNumber = match[2], fileName = match[3];
+        return {
+          file: fileName,
+          level: "warning",
+          message: message,
+          line: lineNumber,
+          raw: fullMatch
+        };
+      }), multiLineWarnings = ref[0], remainingText = ref[1];
+      result.all = multiLineWarnings;
+      result.warnings = multiLineWarnings;
+      ref1 = consume(remainingText, SINGLELINE_WARNING_REGEX, function(match) {
+        var fullMatch, message;
+        fullMatch = match[0], message = match[1];
+        return {
+          file: null,
+          level: "warning",
+          message: message,
+          line: null,
+          raw: fullMatch
+        };
+      }), singleLineWarnings = ref1[0], remainingText = ref1[1];
+      result.all = result.all.concat(singleLineWarnings);
+      result.warnings = result.warnings.concat(singleLineWarnings);
+      ref2 = consume(remainingText, MULTILINE_ERROR_REGEX, function(match) {
+        var fileName, firstMessage, fullMatch, lineNumber, secondMessage;
+        fullMatch = match[0], firstMessage = match[1], lineNumber = match[2], fileName = match[3], secondMessage = match[4];
+        return {
+          file: fileName,
+          level: "error",
+          message: firstMessage + '\n' + secondMessage,
+          line: lineNumber,
+          raw: fullMatch
+        };
+      }), multiLineErrors = ref2[0], remainingText = ref2[1];
+      result.all = result.all.concat(multiLineErrors);
+      result.errors = multiLineErrors;
+      return result;
+    };
+    this.parseBiber = function() {
       var result;
       result = {
         all: [],
@@ -55,6 +125,17 @@ define(function() {
       });
       return result;
     };
+    return this.parse = function() {
+      var firstLine;
+      firstLine = this.lines[0];
+      if (firstLine.match(/^.*INFO - This is Biber.*$/)) {
+        return this.parseBiber();
+      } else if (firstLine.match(/^This is BibTeX, Version.+$/)) {
+        return this.parseBibtex();
+      } else {
+        throw new Error("BibLogParser Error: cannot determine whether text is biber or bibtex output");
+      }
+    };
   }).call(BibLogParser.prototype);
   BibLogParser.parse = function(text, options) {
     return new BibLogParser(text, options).parse();