Index: doc/coreutils.texi
===================================================================
--- doc/coreutils.texi.orig	2011-01-01 22:19:23.000000000 +0100
+++ doc/coreutils.texi	2011-01-05 14:28:30.410663582 +0100
@@ -65,8 +65,6 @@
 * fold: (coreutils)fold invocation.             Wrap long input lines.
 * groups: (coreutils)groups invocation.         Print group names a user is in.
 * head: (coreutils)head invocation.             Output the first part of files.
-* hostid: (coreutils)hostid invocation.         Print numeric host identifier.
-* hostname: (coreutils)hostname invocation.     Print or set system name.
 * id: (coreutils)id invocation.                 Print user identity.
 * install: (coreutils)install invocation.       Copy and change attributes.
 * join: (coreutils)join invocation.             Join lines on a common field.
@@ -197,7 +195,7 @@ Free Documentation License''.
 * File name manipulation::       dirname basename pathchk mktemp
 * Working context::              pwd stty printenv tty
 * User information::             id logname whoami groups users who
-* System context::               date arch nproc uname hostname hostid uptime
+* System context::               date arch nproc uname uptime
 * SELinux context::              chcon runcon
 * Modified command invocation::  chroot env nice nohup stdbuf su timeout
 * Process control::              kill
@@ -413,8 +411,6 @@ System context
 * date invocation::              Print or set system date and time
 * nproc invocation::             Print the number of processors
 * uname invocation::             Print system information
-* hostname invocation::          Print or set system name
-* hostid invocation::            Print numeric host identifier
 * uptime invocation::            Print system uptime and load
 
 @command{date}: Print or set system date and time
@@ -13683,8 +13679,6 @@ information.
 * arch invocation::             Print machine hardware name.
 * nproc invocation::            Print the number of processors.
 * uname invocation::            Print system information.
-* hostname invocation::         Print or set system name.
-* hostid invocation::           Print numeric host identifier.
 * uptime invocation::           Print system uptime and load.
 @end menu
 
@@ -14507,55 +14501,6 @@ Print the kernel version.
 
 @exitstatus
 
-
-@node hostname invocation
-@section @command{hostname}: Print or set system name
-
-@pindex hostname
-@cindex setting the hostname
-@cindex printing the hostname
-@cindex system name, printing
-@cindex appropriate privileges
-
-With no arguments, @command{hostname} prints the name of the current host
-system.  With one argument, it sets the current host name to the
-specified string.  You must have appropriate privileges to set the host
-name.  Synopsis:
-
-@example
-hostname [@var{name}]
-@end example
-
-The only options are @option{--help} and @option{--version}.  @xref{Common
-options}.
-
-@exitstatus
-
-
-@node hostid invocation
-@section @command{hostid}: Print numeric host identifier
-
-@pindex hostid
-@cindex printing the host identifier
-
-@command{hostid} prints the numeric identifier of the current host
-in hexadecimal.  This command accepts no arguments.
-The only options are @option{--help} and @option{--version}.
-@xref{Common options}.
-
-For example, here's what it prints on one system I use:
-
-@example
-$ hostid
-1bac013d
-@end example
-
-On that system, the 32-bit quantity happens to be closely
-related to the system's Internet address, but that isn't always
-the case.
-
-@exitstatus
-
 @node uptime invocation
 @section @command{uptime}: Print system uptime and load
 
Index: man/Makefile.am
===================================================================
--- man/Makefile.am.orig	2011-01-01 22:19:23.000000000 +0100
+++ man/Makefile.am	2011-01-05 14:27:40.742233767 +0100
@@ -197,7 +197,7 @@ check-x-vs-1:
 	@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;		\
 	t=$@-t;								\
 	(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
-	(echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT)		\
+	(echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) hostid	\
 	  | tr -s ' ' '\n' | sed 's/\.1$$//')				\
 	  | $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; };		\
 	rm $$t
Index: man/Makefile.in
===================================================================
--- man/Makefile.in.orig	2011-01-04 12:23:07.000000000 +0100
+++ man/Makefile.in	2011-01-05 14:27:40.768234515 +0100
@@ -1641,7 +1641,7 @@ check-x-vs-1:
 	@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;		\
 	t=$@-t;								\
 	(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
-	(echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT)		\
+	(echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) hostid	\
 	  | tr -s ' ' '\n' | sed 's/\.1$$//')				\
 	  | $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; };		\
 	rm $$t