diff --git a/ChangeLog b/ChangeLog
index bc56e4dfa..9a75e66aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 10 17:39:44 CET 2000  Werner Koch  <wk@gnupg.de>
+
+	* configure.in: Use /usr/local for CFLAGS and LDFLAGS when
+	target is freebsd.  By Rémi.
+
 Thu Jan 13 19:31:58 CET 2000  Werner Koch  <wk@gnupg.de>
 
 	* configure.in: Do not set development version when the version has
diff --git a/checks/ChangeLog b/checks/ChangeLog
index 9861e10f3..0af642df2 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 10 17:39:44 CET 2000  Werner Koch  <wk@gnupg.de>
+
+	* mkdemodirs: Fixed the --clean loop.
+
 Thu Jan 13 19:31:58 CET 2000  Werner Koch  <wk@gnupg.de>
 
 	* defs.inc (chdir): Removed becuase it is unsused an plain old sh
diff --git a/checks/mkdemodirs b/checks/mkdemodirs
index cdd945cbf..f0c7e02ba 100755
--- a/checks/mkdemodirs
+++ b/checks/mkdemodirs
@@ -8,9 +8,9 @@ NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
        Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'
 
 if [ "$1" = "--clean" ]; then
-    for i in $NAMES; do
+    (for i in $NAMES; do
 	[ -d $i ] && rm -r $i
-    done
+    done) || true
     exit 0
 fi
 
@@ -24,9 +24,9 @@ for name in $NAMES; do
     /bin/echo " $name\c"
     [ -d $name ] && rm -r $name
     mkdir $name
-    $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg 
+    $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg
     $GPG --homedir $name --import $name/Secret.gpg
-    $GPGDEMO --export -o - $name > $name/Public.gpg 
+    $GPGDEMO --export -o - $name > $name/Public.gpg
     $GPG --homedir $name --import $name/Public.gpg
     [ -f $name/pubring.gpg~ ] && rm $name/pubring.gpg~
 done
diff --git a/configure.in b/configure.in
index 80862b6ee..b0f193d70 100644
--- a/configure.in
+++ b/configure.in
@@ -194,6 +194,12 @@ case "${target}" in
         try_gdbm="no"
         ;;
 
+    *-*-freebsd*)
+       # FreeBSD
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       ;;
+
     *-*-hpux*)
         if test -z "$GCC" ; then
             CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
diff --git a/g10/ChangeLog b/g10/ChangeLog
index ee9a7c8e4..9702f3779 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 10 17:39:44 CET 2000  Werner Koch  <wk@gnupg.de>
+
+	* keyedit.c (menu_expire): Fixed segv due to unitialized sub_pk.
+	By Rémi.
+
 Thu Feb 10 11:39:41 CET 2000  Werner Koch  <wk@gnupg.de>
 
 	* keylist.c (list_keyblock): Don't print warnings in the middle of
diff --git a/g10/keyedit.c b/g10/keyedit.c
index bed757922..a56f55c4e 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1486,7 +1486,8 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
 	}
 	else if( node->pkt->pkttype == PKT_USER_ID )
 	    uid = node->pkt->pkt.user_id;
-	else if( main_pk && node->pkt->pkttype == PKT_SIGNATURE ) {
+	else if( main_pk && node->pkt->pkttype == PKT_SIGNATURE
+		 && sub_pk != NULL ) {
 	    PKT_signature *sig = node->pkt->pkt.signature;
 	    if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
 		&& (	(mainkey && uid && (sig->sig_class&~3) == 0x10)
@@ -1550,6 +1551,7 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
 		    m_free( sn->pkt );
 		    sn->pkt = newpkt;
 		}
+		sub_pk = NULL;
 	    }
 	}
     }