diff --git a/ChangeLog b/ChangeLog
index a75691c35d..8448bdbe41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-04-14  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile: Include makeconfig before defining rule to regenerate
+	configure files.
+
+	* configure.in: Remove restriction on compiling without static
+	libs.
+
 1998-04-14 16:34  Ulrich Drepper  <drepper@cygnus.com>
 
 	* test-skeleton.c: Provide hook for initializing code before the fork.
diff --git a/FAQ b/FAQ
index 895d8e96c6..6eb4ff0fef 100644
--- a/FAQ
+++ b/FAQ
@@ -118,7 +118,7 @@ please let me know.
 4.2.	When I try to compile code which uses IPv6 headers and
 	definitions on my Linux 2.x.y system I am in trouble.
 	Nothing seems to work.
-4.3.	When I set the timezone I'm by setting the TZ environment variable
+4.3.	When I set the timezone by setting the TZ environment variable
 	to EST5EDT things go wrong since glibc computes the wrong time
 	from this information.
 
@@ -1103,7 +1103,7 @@ snapshot, according to Philip Blundell <Philip.Blundell@pobox.com>, the
 required kernel version is at least 2.1.30.
 
 
-4.3.	When I set the timezone I'm by setting the TZ environment variable
+4.3.	When I set the timezone by setting the TZ environment variable
 	to EST5EDT things go wrong since glibc computes the wrong time
 	from this information.
 
diff --git a/Makefile b/Makefile
index 7d9e98fed5..923a81ec81 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,8 @@ ifneq (,)
 This makefile requires GNU Make.
 endif
 
+include Makeconfig
+
 
 # This is the default target; it makes everything except the tests.
 .PHONY: all
@@ -48,8 +50,6 @@ endif
 configure: configure.in aclocal.m4; $(autoconf-it)
 %/configure: %/configure.in aclocal.m4; $(autoconf-it)
 
-include Makeconfig
-
 ifndef avoid-generated
 -include $(objpfx)sysd-dirs
 define \n
diff --git a/configure b/configure
index c66deb2ddc..083cca461d 100755
--- a/configure
+++ b/configure
@@ -2758,20 +2758,8 @@ if test $shared = default; then
   fi
 fi
 
-if test $static = no && test $shared = yes; then
-  case "$host_os" in
-  linux* | gnu*)
-    { echo "configure: error: 
-*** You must compile with support for the static library since the shared
-*** library uses it.  Restart configure without \`--disable-static'." 1>&2; exit 1; }
-    ;;
-  *)
-    ;;
-  esac
-fi
-
 echo $ac_n "checking whether -fPIC is default""... $ac_c" 1>&6
-echo "configure:2775: checking whether -fPIC is default" >&5
+echo "configure:2763: checking whether -fPIC is default" >&5
 if eval "test \"`echo '$''{'pic_default'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/configure.in b/configure.in
index 86eec3c942..aca7dd1031 100644
--- a/configure.in
+++ b/configure.in
@@ -1111,19 +1111,6 @@ if test $shared = default; then
   fi
 fi
 
-dnl We must not allow compilation without static library on some platforms.
-if test $static = no && test $shared = yes; then
-  case "$host_os" in
-  linux* | gnu*)
-    AC_MSG_ERROR([
-*** You must compile with support for the static library since the shared
-*** library uses it.  Restart configure without \`--disable-static'.])
-    ;;
-  *)
-    ;;
-  esac
-fi
-
 AC_CACHE_CHECK([whether -fPIC is default], pic_default,
 [pic_default=yes
 cat > conftest.c <<EOF