diff --git a/g10/ChangeLog b/g10/ChangeLog
index 252467dda..a81046c8f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -3,6 +3,7 @@
 	* signal.c (got_fatal_signal): Remove lockfiles here because the
 	atexit stuff does not work due to the use of raise. Suggested by
 	Peter Fales.
+	* gpgv.c (remove_lockfiles): New stub.
 	
 2000-12-19  Werner Koch  <wk@gnupg.org>
 
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 2dd4f7b88..5debb8eeb 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -358,6 +358,7 @@ void disable_dotlock(void) {}
 DOTLOCK create_dotlock( const char *file_to_lock ) { return NULL; }
 int make_dotlock( DOTLOCK h, long timeout ) { return 0;}
 int release_dotlock( DOTLOCK h ) {return 0;}
+void remove_lockfiles(void) {}
 
 
 
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 884fc94a3..1e780de4a 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -143,7 +143,7 @@ add_gpg_control( CTX c, PACKET *pkt )
     }   
     else if ( pkt->pkt.gpg_control->control == 2 ) {
         /* Pipemode control packet */
-#warning We have to do some sanit checks all over the place 
+#warning We have to do some sanity checks all over the place 
         if ( pkt->pkt.gpg_control->datalen < 2 ) 
             log_fatal ("invalid pipemode control packet length\n");
         if (pkt->pkt.gpg_control->data[0] == 1) {
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 7ae91cb09..2cdafe67f 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1734,7 +1734,7 @@ parse_encrypted( IOBUF inp, int pkttype, unsigned long pktlen,
 	/* fixme: add some pktlen sanity checks */
 	int version;
 
-#warning decrementing pktlen here is bad as it gives a bad valie in the listing
+#warning decrementing pktlen here is bad as it gives a bad value in the listing
 	version = iobuf_get_noeof(inp); pktlen--;
 	if( version != 1 ) {
 	    log_error("encrypted_mdc packet with unknown version %d\n",