diff --git a/Makefile.am b/Makefile.am
index b07b909fe..a16cc0559 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 
-if COMPILE_LIBGCRYPT
-gcrypt = gcrypt
-else
+#if COMPILE_LIBGCRYPT
+#gcrypt = gcrypt
+#else
 gcrypt =
-endif
+#endif
 
 SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks ${gcrypt}
 EXTRA_DIST = VERSION  PROJECTS BUGS
diff --git a/NEWS b/NEWS
index ce2366369..76ba96e63 100644
--- a/NEWS
+++ b/NEWS
@@ -14,9 +14,9 @@ Noteworthy changes in version 0.9.8
 
     * New option --with-key-data to list the public key parameters.
       New option -N to insert notations and a --set-policy-url.
-      A couple of other options to allow restting of options.
+      A couple of other options to allow reseting of options.
 
-    * Better support for HPUX
+    * Better support for HPUX.
 
 
 Noteworthy changes in version 0.9.7
diff --git a/configure.in b/configure.in
index 5eb68ea5f..d7ad8ea18 100644
--- a/configure.in
+++ b/configure.in
@@ -102,15 +102,16 @@ AC_ARG_WITH(included-zlib,
 [g10_force_zlib=yes], [g10_force_zlib=no] )
 AC_MSG_RESULT($g10_force_zlib)
 
-dnl
-dnl Check wether we want to compile libgcrypt
-dnl
-AC_MSG_CHECKING([whether compilation of libgcrypt is requested])
-AC_ARG_ENABLE(libgcrypt,
-    [  --enable-libgcrypt      compile the libgcrypt [default=no]],
-[compile_libgcrypt="$enableval"],[compile_libgcrypt=no])
-AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes)
-AC_MSG_RESULT($compile_libgcrypt)
+dnl This does not work because automakes install tareget still needs libtool
+dnl dnl
+dnl dnl Check wether we want to compile libgcrypt
+dnl dnl
+dnl AC_MSG_CHECKING([whether compilation of libgcrypt is requested])
+dnl AC_ARG_ENABLE(libgcrypt,
+dnl     [  --enable-libgcrypt      compile the libgcrypt [default=no]],
+dnl [compile_libgcrypt="$enableval"],[compile_libgcrypt=no])
+dnl AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes)
+dnl AC_MSG_RESULT($compile_libgcrypt)
 
 
 dnl Checks for programs.
@@ -135,11 +136,11 @@ AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes)
 
 
 
-if test x$compile_libgcrypt = xyes; then
-   dnl Don't default to build shared libs
-   AM_DISABLE_SHARED
-   AM_PROG_LIBTOOL
-fi
+dnl if test x$compile_libgcrypt = xyes; then
+dnl    dnl Don't default to build shared libs
+dnl    AM_DISABLE_SHARED
+dnl    AM_PROG_LIBTOOL
+dnl fi
 
 
 MPI_OPT_FLAGS=""