diff --git a/installer/osx/freeze.py b/installer/osx/freeze.py
index b380d69d92..6c0abb6ebe 100644
--- a/installer/osx/freeze.py
+++ b/installer/osx/freeze.py
@@ -230,7 +230,7 @@ _check_symlinks_prescript()
         all_functions = main_functions['console'] + main_functions['gui']
         print
         print 'Adding PoDoFo'
-        pdf = glob.glob(os.path.expanduser('/Volumes/sw/podofo/libpodofo.0.7.0.dylib'))[0]
+        pdf = glob.glob(os.path.expanduser('/Volumes/sw/podofo/libpodofo.0.7.00.dylib'))[0]
         shutil.copyfile(pdf, os.path.join(frameworks_dir, os.path.basename(pdf)))
 
 
diff --git a/setup.py b/setup.py
index c83a93fa51..89c4f5c925 100644
--- a/setup.py
+++ b/setup.py
@@ -62,9 +62,9 @@ if __name__ == '__main__':
 
     podofo_inc = '/usr/include/podofo' if islinux else \
     'C:\\podofo\\include\\podofo' if iswindows else \
-    '/Volumes/sw/podofo/include/podofo'
+    '/usr/local/include/podofo'
     podofo_lib = '/usr/lib' if islinux else r'C:\podofo' if iswindows else \
-            '/Volumes/sw/podofo/lib'
+            '/usr/local/lib'
     podofo_inc = os.environ.get('PODOFO_INC_DIR', podofo_inc)
     if os.path.exists(os.path.join(podofo_inc, 'podofo.h')):
         optional.append(Extension('calibre.plugins.podofo',
diff --git a/upload.py b/upload.py
index de68082db4..bc0df0dcc8 100644
--- a/upload.py
+++ b/upload.py
@@ -548,7 +548,7 @@ class build_windows(VMInstaller):
 
 class build_osx(VMInstaller):
     description = 'Build OS X app bundle'
-    VM = '/vmware/Mac OSX/Mac OSX.vmx'
+    VM = '/mnt/backup/calibre_os_x/Mac OSX.vmx'
     if not os.path.exists(VM):
         VM = '/home/kovid/calibre_os_x/Mac OSX.vmx'