diff --git a/Makefile b/Makefile
index 4ae6fae137e..a3f533c7d07 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,6 @@ DIRS = \
 	visualization \
 	locale \
 	man \
-	macosx \
 	mswindows
 
 SUBDIRS = $(DIRS)
diff --git a/macosx/Makefile b/macos/Makefile
similarity index 100%
rename from macosx/Makefile
rename to macos/Makefile
diff --git a/macosx/ReadMe.md b/macos/ReadMe.md
similarity index 100%
rename from macosx/ReadMe.md
rename to macos/ReadMe.md
diff --git a/macosx/app/AppIcon.icns b/macos/app/AppIcon.icns
similarity index 100%
rename from macosx/app/AppIcon.icns
rename to macos/app/AppIcon.icns
diff --git a/macosx/app/English.lproj/MainMenu.nib/classes.nib b/macos/app/English.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from macosx/app/English.lproj/MainMenu.nib/classes.nib
rename to macos/app/English.lproj/MainMenu.nib/classes.nib
diff --git a/macosx/app/English.lproj/MainMenu.nib/data.dependency b/macos/app/English.lproj/MainMenu.nib/data.dependency
similarity index 100%
rename from macosx/app/English.lproj/MainMenu.nib/data.dependency
rename to macos/app/English.lproj/MainMenu.nib/data.dependency
diff --git a/macosx/app/English.lproj/MainMenu.nib/info.nib b/macos/app/English.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from macosx/app/English.lproj/MainMenu.nib/info.nib
rename to macos/app/English.lproj/MainMenu.nib/info.nib
diff --git a/macosx/app/English.lproj/MainMenu.nib/keyedobjects.nib b/macos/app/English.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from macosx/app/English.lproj/MainMenu.nib/keyedobjects.nib
rename to macos/app/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/macosx/app/GRASS.applescript b/macos/app/GRASS.applescript
similarity index 100%
rename from macosx/app/GRASS.applescript
rename to macos/app/GRASS.applescript
diff --git a/macosx/app/GRASSDocument_gxw.icns b/macos/app/GRASSDocument_gxw.icns
similarity index 100%
rename from macosx/app/GRASSDocument_gxw.icns
rename to macos/app/GRASSDocument_gxw.icns
diff --git a/macosx/app/GRASSDocument_gxw.svg b/macos/app/GRASSDocument_gxw.svg
similarity index 100%
rename from macosx/app/GRASSDocument_gxw.svg
rename to macos/app/GRASSDocument_gxw.svg
diff --git a/macosx/app/Info.plist.in b/macos/app/Info.plist.in
similarity index 100%
rename from macosx/app/Info.plist.in
rename to macos/app/Info.plist.in
diff --git a/macosx/app/Makefile b/macos/app/Makefile
similarity index 100%
rename from macosx/app/Makefile
rename to macos/app/Makefile
diff --git a/macosx/app/PkgInfo b/macos/app/PkgInfo
similarity index 100%
rename from macosx/app/PkgInfo
rename to macos/app/PkgInfo
diff --git a/macosx/app/build_gui_user_menu.sh b/macos/app/build_gui_user_menu.sh
similarity index 100%
rename from macosx/app/build_gui_user_menu.sh
rename to macos/app/build_gui_user_menu.sh
diff --git a/macosx/app/build_html_user_index.sh b/macos/app/build_html_user_index.sh
similarity index 100%
rename from macosx/app/build_html_user_index.sh
rename to macos/app/build_html_user_index.sh
diff --git a/macosx/app/grass.sh.in b/macos/app/grass.sh.in
similarity index 100%
rename from macosx/app/grass.sh.in
rename to macos/app/grass.sh.in
diff --git a/macosx/app/main.m b/macos/app/main.m
similarity index 100%
rename from macosx/app/main.m
rename to macos/app/main.m
diff --git a/macosx/app/python_wrapper b/macos/app/python_wrapper
similarity index 100%
rename from macosx/app/python_wrapper
rename to macos/app/python_wrapper
diff --git a/macosx/bundle.make b/macos/bundle.make
similarity index 100%
rename from macosx/bundle.make
rename to macos/bundle.make
diff --git a/macosx/pkg/resources/Description.plist.in b/macos/pkg/resources/Description.plist.in
similarity index 100%
rename from macosx/pkg/resources/Description.plist.in
rename to macos/pkg/resources/Description.plist.in
diff --git a/macosx/pkg/resources/Info.plist.in b/macos/pkg/resources/Info.plist.in
similarity index 100%
rename from macosx/pkg/resources/Info.plist.in
rename to macos/pkg/resources/Info.plist.in
diff --git a/macosx/pkg/resources/License.rtf b/macos/pkg/resources/License.rtf
similarity index 100%
rename from macosx/pkg/resources/License.rtf
rename to macos/pkg/resources/License.rtf
diff --git a/macosx/pkg/resources/ReadMe.rtf b/macos/pkg/resources/ReadMe.rtf
similarity index 100%
rename from macosx/pkg/resources/ReadMe.rtf
rename to macos/pkg/resources/ReadMe.rtf
diff --git a/macosx/pkg/resources/postflight.in b/macos/pkg/resources/postflight.in
similarity index 100%
rename from macosx/pkg/resources/postflight.in
rename to macos/pkg/resources/postflight.in