diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b099d624d..49d40eb11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 variables:
   CHROMAPRINT_FPCALC_VERSION: "1.4.2"
   DISCID_VERSION: "0.6.1"
-  PYTHON_DISCID_VERSION: "1.1.0"
+  PYTHON_DISCID_VERSION: "1.1.1"
   MUTAGEN_VERSION: "1.36"
 
 package win:
diff --git a/picard/tagger.py b/picard/tagger.py
index eb013eada..3e36ad40f 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -151,7 +151,7 @@ class Tagger(QtGui.QApplication):
         log.debug("Platform: %s %s %s", platform.platform(),
                   platform.python_implementation(), platform.python_version())
         log.debug("Versions: %s", versions.as_string())
-        log.debug("Configuration file path: %s", config.config.fileName())
+        log.debug("Configuration file path: %r", config.config.fileName())
 
         # TODO remove this before the final release
         if sys.platform == "win32":
@@ -160,12 +160,12 @@ class Tagger(QtGui.QApplication):
             olduserdir = "~/.picard"
         olduserdir = os.path.expanduser(olduserdir)
         if os.path.isdir(olduserdir):
-            log.info("Moving %s to %s", olduserdir, USER_DIR)
+            log.info("Moving %r to %r", olduserdir, USER_DIR)
             try:
                 shutil.move(olduserdir, USER_DIR)
             except:
                 pass
-        log.debug("User directory: %s", os.path.abspath(USER_DIR))
+        log.debug("User directory: %r", os.path.abspath(USER_DIR))
 
         # for compatibility with pre-1.3 plugins
         QtCore.QObject.tagger = self
@@ -356,10 +356,10 @@ class Tagger(QtGui.QApplication):
         for filename in filenames:
             filename = os.path.normpath(os.path.realpath(filename))
             if ignore_hidden and is_hidden(filename):
-                log.debug("File ignored (hidden): %s" % (filename))
+                log.debug("File ignored (hidden): %r" % (filename))
                 continue
             if ignoreregex is not None and ignoreregex.search(filename):
-                log.info("File ignored (matching %s): %s" % (pattern, filename))
+                log.info("File ignored (matching %r): %r" % (pattern, filename))
                 continue
             if filename not in self.files:
                 file = open_file(filename)
@@ -399,7 +399,7 @@ class Tagger(QtGui.QApplication):
                         'count': number_of_files,
                         'directory': root,
                     }
-                    log.debug("Adding %(count)d files from '%(directory)s'" %
+                    log.debug("Adding %(count)d files from '%(directory)r'" %
                               mparms)
                     self.window.set_statusbar_message(
                         ungettext(
@@ -432,7 +432,7 @@ class Tagger(QtGui.QApplication):
                 'count': number_of_files,
                 'directory': path,
             }
-            log.debug("Adding %(count)d files from '%(directory)s'" %
+            log.debug("Adding %(count)d files from '%(directory)r'" %
                       mparms)
             self.window.set_statusbar_message(
                 ungettext(
diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py
index 133367036..c4d9c1f8a 100644
--- a/picard/ui/mainwindow.py
+++ b/picard/ui/mainwindow.py
@@ -799,7 +799,7 @@ class MainWindow(QtGui.QMainWindow):
 
     def open_folder(self):
         files = self.tagger.get_files_from_objects(self.selected_objects)
-        folders = set([os.path.realpath(os.path.dirname(f.filename)) for f in files])
+        folders = set([os.path.dirname(f.filename) for f in files])
         for folder in folders:
             QtGui.QDesktopServices.openUrl(self._openUrl(folder))
 
diff --git a/scripts/package-osx.sh b/scripts/package-osx.sh
index e07fc7690..be230e8e1 100644
--- a/scripts/package-osx.sh
+++ b/scripts/package-osx.sh
@@ -15,7 +15,7 @@ virtualenv -p python2.7 --system-site-packages e
 . e/bin/activate
 
 pip install mutagen==$MUTAGEN_VERSION
-pip install https://github.com/JonnyJD/python-discid/archive/dmg.zip # XXX can't use $PYTHON_DISCID_VERSION
+pip install discid==$PYTHON_DISCID_VERSION
 pip install py2app
 
 perl -pi -e 's{plugin_dir = (.*)$}{plugin_dir = "/Developer/Applications/Qt/plugins"}' e/lib/python2.7/site-packages/py2app/recipes/sip.py