diff --git a/pkg/scripts/postinstall b/pkg/scripts/postinstall
index c464c8d..0691ef1 100755
--- a/pkg/scripts/postinstall
+++ b/pkg/scripts/postinstall
@@ -1,3 +1,11 @@
 #!/bin/bash
 
-defaults write ~/Library/Developer/Xcode/Plug-ins/OrcaM.ideplugin/Contents/Info.plist DVTPlugInCompatibilityUUIDs -array $(defaults read /Applications/Xcode.app/Contents/Info.plist DVTPlugInCompatibilityUUID)
+if [ ! -f /Applications/Xcode.app/Contents/Info.plist ]
+then
+    exit 0
+fi
+
+UUID=`defaults read /Applications/Xcode.app/Contents/Info.plist DVTPlugInCompatibilityUUID`
+
+defaults write "$2/Plug-ins/OrcaM.ideplugin/Contents/Info.plist" DVTPlugInCompatibilityUUIDs -array-add "${UUID}"
+
diff --git a/pkg/scripts/preinstall b/pkg/scripts/preinstall
index 974b7a2..e0f655a 100755
--- a/pkg/scripts/preinstall
+++ b/pkg/scripts/preinstall
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-for item in ~/"Library/Developer/Xcode/Templates/Apple IIgs" ~/"Library/Developer/Xcode/Templates/File Templates/Apple IIgs"
-do
-    if [ -d "$item" ]
-    then
-        rm -rf "$item"
-    fi
-done
+rm -rf "$2/Templates/Apple IIgs"
+rm -rf "$2/Templates/File Templates/Apple IIgs"
+rm -rf "$2/Plug-ins/OrcaM.ideplugin"
+