diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index f419c7428..612e489c3 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 22 18:16:29 1997  Gary Houston  <ghouston@actrix.gen.nz>
+
+	* net_db.c (scm_gethost): don't check HAVE_GETHOSTENT, since 
+	configure doesn't know about it.
+
 Fri Mar 21 23:49:28 1997  Mikael Djurfeldt  <mdj@mdj.nada.kth.se>
 
 	* snarf.h, backtrace.c: Name change SCM_GLOBAL --> SCM_VCELL.
diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index f18033012..a1e93a99a 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -37,21 +37,21 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
-host_alias = @host_alias@
 host_triplet = @host@
-RANLIB = @RANLIB@
-LIBTOOL = @LIBTOOL@
-AWK = @AWK@
-module = @module@
-LIBLOBJS = @LIBLOBJS@
-CC = @CC@
-PACKAGE = @PACKAGE@
+host_alias = @host_alias@
 ERRNO_EXTRACT = @ERRNO_EXTRACT@
 FD_SETTER = @FD_SETTER@
+LIBLOBJS = @LIBLOBJS@
+AWK = @AWK@
+LIBTOOL = @LIBTOOL@
+module = @module@
 VERSION = @VERSION@
+CC = @CC@
+RANLIB = @RANLIB@
+MAINT = @MAINT@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 xtra_PLUGIN_guile_libs = @xtra_PLUGIN_guile_libs@
-MAINT = @MAINT@
+PACKAGE = @PACKAGE@
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -133,7 +133,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@
 DATA =  $(modinclude_DATA)
 
-HEADERS =  $(modinclude_HEADERS) $(include_HEADERS)
+HEADERS =  $(include_HEADERS) $(modinclude_HEADERS)
 
 DIST_COMMON =  COPYING ChangeLog Makefile.am Makefile.in acconfig.h \
 acinclude.m4 aclocal.m4 configure configure.in fd.h.in guile-snarf.in \
@@ -297,19 +297,6 @@ uninstall-modincludeDATA:
 	  rm -f $(modincludedir)/$$p; \
 	done
 
-install-modincludeHEADERS: $(modinclude_HEADERS)
-	$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(modincludedir)
-	@list="$(modinclude_HEADERS)"; for p in $$list; do \
-	  echo "$(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p"; \
-	  $(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p; \
-	done
-
-uninstall-modincludeHEADERS:
-	list="$(modinclude_HEADERS)"; for p in $$list; do \
-	  rm -f $(modincludedir)/$$p; \
-	done
-
 install-includeHEADERS: $(include_HEADERS)
 	$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(includedir)
@@ -323,6 +310,19 @@ uninstall-includeHEADERS:
 	  rm -f $(includedir)/$$p; \
 	done
 
+install-modincludeHEADERS: $(modinclude_HEADERS)
+	$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(modincludedir)
+	@list="$(modinclude_HEADERS)"; for p in $$list; do \
+	  echo "$(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p"; \
+	  $(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p; \
+	done
+
+uninstall-modincludeHEADERS:
+	list="$(modinclude_HEADERS)"; for p in $$list; do \
+	  rm -f $(modincludedir)/$$p; \
+	done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES)
@@ -419,21 +419,21 @@ installcheck:
 install-exec: install-libPROGRAMS install-binSCRIPTS
 	$(NORMAL_INSTALL)
 
-install-data: install-modincludeDATA install-modincludeHEADERS install-includeHEADERS
+install-data: install-modincludeDATA install-includeHEADERS install-modincludeHEADERS
 	$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
 
-uninstall: uninstall-libPROGRAMS uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-modincludeHEADERS uninstall-includeHEADERS
+uninstall: uninstall-libPROGRAMS uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-includeHEADERS uninstall-modincludeHEADERS
 
 all: $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) Makefile scmconfig.h
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 installdirs:
-	$(mkinstalldirs)  $(libdir) $(bindir) $(modincludedir) $(modincludedir) \
-		$(includedir)
+	$(mkinstalldirs)  $(libdir) $(bindir) $(modincludedir) $(includedir) \
+		$(modincludedir)
 
 
 mostlyclean-generic:
@@ -478,10 +478,10 @@ install-libPROGRAMS mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
 install-binSCRIPTS uninstall-modincludeDATA install-modincludeDATA \
-uninstall-modincludeHEADERS install-modincludeHEADERS \
-uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
+uninstall-includeHEADERS install-includeHEADERS \
+uninstall-modincludeHEADERS install-modincludeHEADERS tags \
+mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+distdir mostlyclean-depend distclean-depend clean-depend \
 maintainer-clean-depend info dvi installcheck install-exec install-data \
 install uninstall all installdirs mostlyclean-generic distclean-generic \
 clean-generic maintainer-clean-generic clean mostlyclean distclean \
diff --git a/libguile/net_db.c b/libguile/net_db.c
index fccff300b..6f86f10f0 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -163,15 +163,12 @@ scm_gethost (name)
   struct in_addr inad;
   char **argv;
   int i = 0;
-#ifdef HAVE_GETHOSTENT
   if (SCM_UNBNDP (name))
     {
       SCM_DEFER_INTS;
       entry = gethostent ();
     }
-  else
-#endif
-  if (SCM_NIMP (name) && SCM_ROSTRINGP (name))
+  else if (SCM_NIMP (name) && SCM_ROSTRINGP (name))
     {
       SCM_DEFER_INTS;
       entry = gethostbyname (SCM_ROCHARS (name));