diff --git a/osx/Makefile b/osx/Makefile
deleted file mode 100644
index 738a27a..0000000
--- a/osx/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-all:
-	python build.py -c openlp.cfg
-
-view:
-	python build.py -c openlp.cfg --package-view --compress-view
-
-package:
-
-	python build.py -c openlp.cfg --package --package-view
-
-bundle:
-
-	python build.py -c openlp.cfg --compress --compress-view
-
-clean:
-	# remove old configuration files
-	rm -f openlp.spec
-	rm -f Info.plist
-	rm -f .version
-
-	# remove old build artifacts
-	rm -rf build
-	rm -rf dist
-	rm -rf Macopenlp.app
-	rm -rf OpenLP.app
-	rm -f warnopenlp.txt
-	rm -f *dmg
-        
diff --git a/osx/applescript-adjustview-10-6.master b/osx/applescript-adjust-dmg-view.master
similarity index 100%
rename from osx/applescript-adjustview-10-6.master
rename to osx/applescript-adjust-dmg-view.master
diff --git a/osx/applescript-adjustview-10-5.master b/osx/applescript-adjustview-10-5.master
deleted file mode 100755
index 19be239..0000000
--- a/osx/applescript-adjustview-10-5.master
+++ /dev/null
@@ -1,74 +0,0 @@
-on saveImageWithItselfAsIcon(icon_image_file)
-	-- save icon_image_file with itself as icon
-	set icon_image_file_string to icon_image_file as string
-	tell application "Image Events"
-		launch
-		set icon_image to open file icon_image_file_string
-		save icon_image with icon
-		close icon_image
-	end tell
-end saveImageWithItselfAsIcon
-
-on copyIconOfTo(aFileOrFolderWithIcon, aFileOrFolder)
-	tell application "Finder" to set f to aFileOrFolderWithIcon as alias
-	-- grab the file's icon
-	my CopyOrPaste(f, "c")
-	-- now the icon is in the clipboard
-	tell application "Finder" to set c to aFileOrFolder as alias
-	my CopyOrPaste(result, "v")
-end copyIconOfTo
-
-on CopyOrPaste(i, cv)
-	tell application "Finder"
-		activate
-    open information window of i
-	end tell
-	tell application "System Events" to tell process "Finder" to tell window 1
-		keystroke tab -- select icon button
-		keystroke (cv & "w") using command down (* (copy or paste) + close window *)
-	end tell -- window 1 then process Finder then System Events
-end CopyOrPaste
-
-on run
-	set icon_image_file to POSIX file "%s" as alias
-	set dmg_file to POSIX file "/Volumes/%s" as alias
-
-	my saveImageWithItselfAsIcon(icon_image_file)
-	-- wait for virus scanner
-	delay 2
-	my copyIconOfTo(icon_image_file, dmg_file)
-
-	tell application "Finder"
-		tell disk "%s"
-			open
-			set current view of container window to icon view
-			set toolbar visible of container window to false
-			set statusbar visible of container window to false
-			set the bounds of container window to {400, 100, 1100, 500}
-			set theViewOptions to the icon view options of container window
-			set arrangement of theViewOptions to not arranged
-			set icon size of theViewOptions to 128
-			set background picture of theViewOptions to file ".background:installer-background.png"
-                        if not exists file "Applications" then
-			    make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
-                        end if
-			delay 5
-			set position of item "%s" of container window to {160, 200}
-			set position of item ".Trashes" of container window to {100, 500}
-			set position of item ".installer-background.png" of container window to {200, 500}
-			set position of item ".DS_Store" of container window to {400, 500}
-			set position of item "Applications" of container window to {550, 200}
-			set position of item ".VolumeIcon.icns" of container window to {500, 500}
-			set position of item ".fseventsd" of container window to {300, 500}
-			if exists POSIX file ".SymAVx86QSFile" then
-				set position of item ".SymAVx86QSFile" of container window to {600, 500}
-			end if
-			open
-			close
-			update without registering applications
-			-- wait until the virus scan completes
-			delay 5
-			-- eject
-		end tell
-	end tell
-end run
diff --git a/osx/macosx-builder.py b/osx/macosx-builder.py
index 25605bc..fe36df7 100644
--- a/osx/macosx-builder.py
+++ b/osx/macosx-builder.py
@@ -623,8 +623,8 @@ class MacosxBuilder(object):
         try:
             # TODO: Use only one applescript file. Remove one for osx 10.5.
             f = open(os.path.join(self.script_path,
-                'applescript-adjustview-10-6.master'))
-            p = Popen(["osascript"], stdin=PIPE)
+                'applescript-adjust-dmg-view.master'))
+            p = Popen([self.osascript], stdin=PIPE)
             p.communicate(f.read() % (dmg_volume_name, 'OpenLP'))
             f.close()
             result = p.returncode