diff --git a/misc/scripts/makemactags.sh b/misc/scripts/makemactags.sh
deleted file mode 100755
index c5d511d43b..0000000000
--- a/misc/scripts/makemactags.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. `dirname $0`/makeunixtags.sh
-
-create_tags osx/{carbon,corefoundation}
diff --git a/misc/scripts/makeosxtags.sh b/misc/scripts/makeosxtags.sh
new file mode 100755
index 0000000000..99885fabb0
--- /dev/null
+++ b/misc/scripts/makeosxtags.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+. `dirname $0`/makeunixtags.sh
+
+osx_port=${1-carbon}
+ctags --totals --c++-kinds=+px --language-force=c++ \
+    -f osx_$osx_port.tags \
+    -I @misc/scripts/ctags.ignore \
+    include/wx/osx/*.h \
+    include/wx/osx/core/*.h \
+    include/wx/osx/core/private/*.h \
+    include/wx/osx/private/*.h \
+    include/wx/osx/$osx_port/*.h \
+    include/wx/osx/$osx_port/private/*.h \
+    src/osx/*.cpp \
+    src/osx/core/*.cpp \
+    src/osx/$osx_port/*.{cpp,mm}