--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -75,7 +75,6 @@
 include strings/module.mk
 include testfun/module.mk
 include time/module.mk
-include ui/module.mk
 
 nobase_fcnfile_DATA = $(FCN_FILES) $(GEN_FCN_FILES) $(JAR_FILES)
 

rename from scripts/ui/errordlg.m
rename to scripts/gui/errordlg.m

rename from scripts/ui/helpdlg.m
rename to scripts/gui/helpdlg.m

rename from scripts/ui/inputdlg.m
rename to scripts/gui/inputdlg.m

rename from scripts/ui/listdlg.m
rename to scripts/gui/listdlg.m

--- a/scripts/gui/module.mk
+++ b/scripts/gui/module.mk
@@ -7,11 +7,18 @@
   gui/private/__uigetdir_fltk__.m \
   gui/private/__uigetfile_fltk__.m \
   gui/private/__uiobject_split_args__.m \
-  gui/private/__uiputfile_fltk__.m
+  gui/private/__uiputfile_fltk__.m \
+  gui/private/message_dialog.m
 
 gui_FCN_FILES = \
+  gui/errordlg.m \
   gui/guidata.m \
   gui/guihandles.m \
+  gui/helpdlg.m \
+  gui/inputdlg.m \
+  gui/listdlg.m \
+  gui/msgbox.m \
+  gui/questdlg.m \
   gui/uicontextmenu.m \
   gui/uicontrol.m \
   gui/uigetdir.m \
@@ -26,6 +33,7 @@
   gui/uiwait.m \
   gui/waitbar.m \
   gui/waitforbuttonpress.m \
+  gui/warndlg.m \
   $(gui_PRIVATE_FCN_FILES)
 
 FCN_FILES += $(gui_FCN_FILES)

rename from scripts/ui/msgbox.m
rename to scripts/gui/msgbox.m

rename from scripts/ui/private/message_dialog.m
rename to scripts/gui/private/message_dialog.m

rename from scripts/ui/questdlg.m
rename to scripts/gui/questdlg.m

rename from scripts/ui/warndlg.m
rename to scripts/gui/warndlg.m

deleted file mode 100644
--- a/scripts/ui/module.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-FCN_FILE_DIRS += ui
-
-ui_PRIVATE_FCN_FILES = \
-  ui/private/message_dialog.m
-
-ui_FCN_FILES = \
-  ui/errordlg.m \
-  ui/helpdlg.m \
-  ui/inputdlg.m \
-  ui/listdlg.m \
-  ui/msgbox.m \
-  ui/questdlg.m \
-  ui/warndlg.m \
-  $(ui_PRIVATE_FCN_FILES)
-
-FCN_FILES += $(ui_FCN_FILES)
-
-PKG_ADD_FILES += ui/PKG_ADD
-
-DIRSTAMP_FILES += ui/$(octave_dirstamp)