diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index d2f9eb381..0bedc0632 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -74,20 +74,6 @@ install-exec-hook::
 
 endif
 
-if BUILD_WALL
-usrbin_exec_PROGRAMS += wall
-wall_SOURCES = wall.c ttymsg.c ttymsg.h
-dist_man_MANS += wall.1
-
-if USE_TTY_GROUP
-if MAKEINSTALL_DO_CHOWN
-install-exec-hook::
-	chgrp tty $(DESTDIR)$(usrbin_execdir)/wall
-	chmod g+s $(DESTDIR)$(usrbin_execdir)/wall
-endif
-endif
-endif
-
 noinst_PROGRAMS = checktty_test islocal_test
 checktty_test_SOURCES = checktty.c login.h
 checktty_test_CPPFLAGS = -DMAIN_TEST_CHECKTTY $(AM_CPPFLAGS)
diff --git a/term-utils/Makefile.am b/term-utils/Makefile.am
index c14c1489a..26f924401 100644
--- a/term-utils/Makefile.am
+++ b/term-utils/Makefile.am
@@ -50,3 +50,17 @@ if BUILD_MESG
 usrbin_exec_PROGRAMS += mesg
 dist_man_MANS += mesg.1
 endif
+
+if BUILD_WALL
+usrbin_exec_PROGRAMS += wall
+wall_SOURCES = wall.c ttymsg.c ttymsg.h
+dist_man_MANS += wall.1
+
+if USE_TTY_GROUP
+if MAKEINSTALL_DO_CHOWN
+install-exec-hook::
+	chgrp tty $(DESTDIR)$(usrbin_execdir)/wall
+	chmod g+s $(DESTDIR)$(usrbin_execdir)/wall
+endif
+endif
+endif
diff --git a/login-utils/ttymsg.c b/term-utils/ttymsg.c
similarity index 100%
rename from login-utils/ttymsg.c
rename to term-utils/ttymsg.c
diff --git a/login-utils/ttymsg.h b/term-utils/ttymsg.h
similarity index 100%
rename from login-utils/ttymsg.h
rename to term-utils/ttymsg.h
diff --git a/login-utils/wall.1 b/term-utils/wall.1
similarity index 100%
rename from login-utils/wall.1
rename to term-utils/wall.1
diff --git a/login-utils/wall.c b/term-utils/wall.c
similarity index 100%
rename from login-utils/wall.c
rename to term-utils/wall.c