diff --git a/g10/ChangeLog b/g10/ChangeLog
index b5c8002b0..9b41761fa 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-24  David Shaw  <dshaw@jabberwocky.com>
+
+	* signal.c, tdbio.c: Comment out the transaction code.  It was not
+	used in this version, and was causing some build problems on
+	quasi-posix platforms (Solaris and Forte c89).
+
 2003-06-19  David Shaw  <dshaw@jabberwocky.com>
 
 	* Makefile.am: Include W32LIBS where appropriate.
diff --git a/g10/signal.c b/g10/signal.c
index 0f3db8d99..3c59b44fc 100644
--- a/g10/signal.c
+++ b/g10/signal.c
@@ -154,7 +154,8 @@ pause_on_sigusr( int which )
 #endif
 }
 
-
+/* Disabled - see comment in tdbio.c:tdbio_begin_transaction() */
+#if 0
 static void
 do_block( int block )
 {
@@ -211,7 +212,6 @@ do_block( int block )
 #endif /*HAVE_DOSISH_SYSTEM*/
 }
 
-
 void
 block_all_signals()
 {
@@ -223,3 +223,4 @@ unblock_all_signals()
 {
     do_block(0);
 }
+#endif
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 0f2f90b86..d5e01238c 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -332,7 +332,9 @@ tdbio_sync()
     return 0;
 }
 
-
+#if 0
+/* The transaction code is disabled in the 1.2.x branch, as it is not
+   yet used.  It will be enabled in 1.3.x. */
 
 /****************
  * Simple transactions system:
@@ -402,7 +404,7 @@ tdbio_cancel_transaction()
     in_transaction = 0;
     return 0;
 }
-
+#endif
 
 
 /********************************************************