diff --git a/Makefile.am b/Makefile.am
index 1d3bec696..20fad9107 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ else
 checks = checks
 endif
 
-SUBDIRS = intl zlib util mpi cipher tools g10 po doc ${checks} ${gcrypt}
+SUBDIRS = intl zlib util mpi cipher ${gcrypt} tools g10 po doc ${checks} 
 EXTRA_DIST = README-alpha VERSION  PROJECTS BUGS
 # gettext never gets it right, so we take here care of deleting the
 # symlink.  my_clean_gcrypt is just a kludge until we can include
@@ -37,7 +37,6 @@ dist-hook:
 	sed -e 's/@pkg_version@/$(VERSION)/g' \
 	    $(top_srcdir)/scripts/gnupg.spec.in \
 	    > $(distdir)/scripts/gnupg.spec
-	-rm $(distdir)/gcrypt/*.[ch]
 
 
 if MAINTAINER_MODE
diff --git a/checks/genkey1024.test b/checks/genkey1024.test
index 59bdcf0af..81cb24fce 100755
--- a/checks/genkey1024.test
+++ b/checks/genkey1024.test
@@ -13,7 +13,7 @@ fi
 LANG=
 LANGUAGE=
 
-expect  - <<EOF 
+expect  - <<EOF >/dev/null
 #set timeout -1
 set timeout 8
 match_max 100000
diff --git a/g10/ChangeLog b/g10/ChangeLog
index b5ded0c28..c7c3dc204 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 26 20:03:44 CEST 1999  Werner Koch  <wk@gnupg.de>
+
+	* Makefile.am (basicdefs.h): Added.
+	(install-data-local): Removed the handling for historic gpgm.
+
 Tue Oct 26 14:10:21 CEST 1999  Werner Koch  <wk@gnupg.de>
 
 	* misc.c (openpgp_cipher_test_algo): New.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index d2fd427c0..8e0ac443f 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -13,6 +13,7 @@ bin_PROGRAMS = gpg
 common_source =  \
 	      build-packet.c	\
 	      compress.c	\
+	      basicdefs.h	\
 	      filter.h		\
 	      free-packet.c	\
 	      getkey.c		\
@@ -86,9 +87,4 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) $(srcdir)/options.skel \
 				$(DESTDIR)$(pkgdatadir)/options.skel
-	@set -e;\
-	 if test -f $(DESTDIR)$(bindir)/gpgm ; then \
-	   echo "removing obsolete gpgm binary" ;   \
-	   rm $(DESTDIR)$(bindir)/gpgm ;	    \
-	 fi
 
diff --git a/g10/basicdefs.h b/g10/basicdefs.h
new file mode 100644
index 000000000..9e1edb56d
--- /dev/null
+++ b/g10/basicdefs.h
@@ -0,0 +1,40 @@
+/* basicdefs.h - Some definitions used at many place
+ *	Copyright (C) 1999 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef G10_BASICDEFS_H
+#define G10_BASICDEFS_H
+
+#include "types.h"
+
+typedef struct {
+    int algo;
+    int keylen;
+    byte key[32]; /* this is the largest used keylen (256 bit) */
+} DEK;
+
+
+struct pk_list;
+struct sk_list;
+typedef struct pk_list *PK_LIST;
+typedef struct sk_list *SK_LIST;
+
+
+
+#endif /* G10_BASICDEFS_H */
diff --git a/include/g10lib.h b/include/g10lib.h
index 3fa669a8c..38bd63128 100644
--- a/include/g10lib.h
+++ b/include/g10lib.h
@@ -29,7 +29,7 @@
   #error  gcrypt.h already included
 #endif
 
-#include "gcrypt.h"
+#include <gcrypt.h>
 
 #ifdef G10_I18N_H
   #error i18n should not be included here
diff --git a/po/de.po b/po/de.po
index 071e6293f..8edd12dfb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Walter Koch <koch@hsp.de>, 1998.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-10-26 13:53+0200\n"
+"POT-Creation-Date: 1999-10-26 18:57+0200\n"
 "PO-Revision-Date: 1999-09-04 22:36+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 944806eea..637f7ab67 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 0.9.7
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-10-26 13:53+0200\n"
+"POT-Creation-Date: 1999-10-26 18:57+0200\n"
 "PO-Revision-Date: 1999-06-06 18:33+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
diff --git a/po/fr.po b/po/fr.po
index 7016408bc..3618281a7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1\n"
-"POT-Creation-Date: 1999-10-26 13:53+0200\n"
+"POT-Creation-Date: 1999-10-26 18:57+0200\n"
 "PO-Revision-Date: 1999-10-06 21:43+0200\n"
 "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
diff --git a/po/it.po b/po/it.po
index 9c2dd6a1e..542ea01d9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0\n"
-"POT-Creation-Date: 1999-10-26 13:53+0200\n"
+"POT-Creation-Date: 1999-10-26 18:57+0200\n"
 "PO-Revision-Date: 1999-09-09 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 4b7705d1b..42228cd55 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.11\n"
-"POT-Creation-Date: 1999-10-26 13:53+0200\n"
+"POT-Creation-Date: 1999-10-26 18:57+0200\n"
 "PO-Revision-Date: 1999-09-07 10:59+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5b393ceb1..70dd44aac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-10-26 13:53+0200\n"
+"POT-Creation-Date: 1999-10-26 18:57+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <jungmann@usa.net>\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 03062f20b..6246fdf44 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 1999-10-26 13:53+0200\n"
+"POT-Creation-Date: 1999-10-26 18:57+0200\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt\n"
diff --git a/po/ru.po b/po/ru.po
index 1d2282e78..db99812a3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-10-26 13:53+0200\n"
+"POT-Creation-Date: 1999-10-26 18:57+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <steuck@iname.com>\n"