diff --git a/ChangeLog b/ChangeLog
index 28446dd5..2666e98e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-23  Jay Berkenbilt  <ejb@ql.org>
+
+	* make/libtool.mk (install): Do not strip executables and shared
+	libraries during installation.  Leave that up to the packager.
+
+	* configure.ac: disable -Werror by default.
+
 2011-05-07  Jay Berkenbilt  <ejb@ql.org>
 
 	* libqpdf/QPDF_linearization.cc (isLinearized): remove unused
diff --git a/README.maintainer b/README.maintainer
index 134c0e9a..1b959243 100644
--- a/README.maintainer
+++ b/README.maintainer
@@ -33,7 +33,7 @@ Release Reminders
    make_dist does the following:
 
     ./autogen.sh
-    ./configure --enable-doc-maintenance
+    ./configure --enable-doc-maintenance --enable-werror
     make build_manual
     make distclean
 
diff --git a/configure.ac b/configure.ac
index bbb5d19a..ac543e12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,12 +114,12 @@ if test "$BUILDRULES" != "msvc"; then
    AC_MSG_CHECKING(for whether to use -Werror)
    AC_ARG_ENABLE(werror,
       AS_HELP_STRING([--enable-werror],
-		     [whether to use werror (default is yes if -Wall works)]),
+		     [whether to use werror (default is no)]),
       [if test "$enableval" = "yes"; then
 	 qpdf_USE_WERROR=1;
        else
 	 qpdf_USE_WERROR=0;
-       fi], [qpdf_USE_WERROR=$qpdf_USE_WALL])
+       fi], [qpdf_USE_WERROR=0])
    if test "$qpdf_USE_WERROR" = "1"; then
       AC_MSG_RESULT(yes)
       CFLAGS="$CFLAGS -Werror"
diff --git a/make/libtool.mk b/make/libtool.mk
index 948442da..db307053 100644
--- a/make/libtool.mk
+++ b/make/libtool.mk
@@ -98,15 +98,15 @@ install: all
 	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
 	./mkinstalldirs $(DESTDIR)$(docdir)
 	./mkinstalldirs $(DESTDIR)$(mandir)/man1
-	$(LIBTOOL) --mode=install install -s -c \
+	$(LIBTOOL) --mode=install install -c \
 		libqpdf/$(OUTPUT_DIR)/libqpdf.la \
 		$(DESTDIR)$(libdir)/libqpdf.la
 	$(LIBTOOL) --finish $(DESTDIR)$(libdir)
 	$(RM) $(DESTDIR)$(libdir)/libqpdf.la
-	$(LIBTOOL) --mode=install install -s -c \
+	$(LIBTOOL) --mode=install install -c \
 		qpdf/$(OUTPUT_DIR)/qpdf \
 		$(DESTDIR)$(bindir)/qpdf
-	$(LIBTOOL) --mode=install install -s -c \
+	$(LIBTOOL) --mode=install install -c \
 		zlib-flate/$(OUTPUT_DIR)/zlib-flate \
 		$(DESTDIR)$(bindir)/zlib-flate
 	cp qpdf/fix-qdf $(DESTDIR)$(bindir)
diff --git a/make_dist b/make_dist
index 71e3be55..e6c489ff 100755
--- a/make_dist
+++ b/make_dist
@@ -110,7 +110,7 @@ if ($version_error)
 }
 
 run("./autogen.sh");
-run("./configure --enable-doc-maintenance");
+run("./configure --enable-doc-maintenance --enable-werror");
 run("make build_manual");
 run("make distclean");
 cd($pwd);