diff --git a/Build/InstallDesktopFile.hs b/Build/InstallDesktopFile.hs
index d509c33138..f39237902c 100644
--- a/Build/InstallDesktopFile.hs
+++ b/Build/InstallDesktopFile.hs
@@ -87,7 +87,7 @@ writeOSXDesktop command = do
 
 installOSXAppFile :: FilePath -> FilePath -> Maybe String -> IO ()
 installOSXAppFile appdir appfile mcontent = do
-	let src = "ui-macos" </> appdir </> appfile
+	let src = "standalone" </> "macos" </> appdir </> appfile
 	home <- myHomeDir
 	dest <- ifM systemwideInstall
 		( return $ "/Applications" </> appdir </> appfile
diff --git a/Makefile b/Makefile
index 0a1093f811..5bd4401b6f 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS
 osxapp: $(bins)
 	rm -rf "$(OSXAPP_DEST)"
 	install -d $(GIT_ANNEX_TMP_BUILD_DIR)/build-dmg
-	cp -R ui-macos/git-annex.app "$(OSXAPP_DEST)"
+	cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)"
 
 	install -d "$(OSXAPP_BASE)/bin"
 	cp git-annex "$(OSXAPP_BASE)/bin/"
diff --git a/debian/copyright b/debian/copyright
index 4992430410..48df4854a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Files: Assistant/WebApp.hs Assistant/WebApp/* templates/* static/*
 Copyright: © 2012 Joey Hess <joey@kitenet.net>
 License: AGPL-3+
 
-Files: doc/logo* */favicon.ico ui-macos/git-annex.app/Contents/Resources/git-annex.icns
+Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns
 Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
            2010 Joey Hess <joey@kitenet.net>
 License: other
diff --git a/ui-macos/git-annex.app/Contents/Info.plist b/standalone/osx/git-annex.app/Contents/Info.plist
similarity index 100%
rename from ui-macos/git-annex.app/Contents/Info.plist
rename to standalone/osx/git-annex.app/Contents/Info.plist
diff --git a/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp b/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp
similarity index 100%
rename from ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp
rename to standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp
diff --git a/ui-macos/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell
similarity index 100%
rename from ui-macos/git-annex.app/Contents/MacOS/runshell
rename to standalone/osx/git-annex.app/Contents/MacOS/runshell
diff --git a/ui-macos/git-annex.app/Contents/Resources/git-annex.icns b/standalone/osx/git-annex.app/Contents/Resources/git-annex.icns
similarity index 100%
rename from ui-macos/git-annex.app/Contents/Resources/git-annex.icns
rename to standalone/osx/git-annex.app/Contents/Resources/git-annex.icns