diff --git a/NEWS b/NEWS
index f14fcabb..fbe6cb25 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,10 @@
-$Id: NEWS,v 1.79 2005/09/17 01:42:55 rocky Exp $
+$Id: NEWS,v 1.80 2005/09/17 20:57:19 rocky Exp $
 
 version 0.76
 =====================================
 2005-??-??
 
-- Make libiso9660 and libcdio_cdda  compile under C++ and add example
-  programs to make sure this gets tested
+- Better compatibility with C++
 
 - a better eject routine for FreeBSD
 
@@ -280,4 +279,4 @@ version 0.1
 
   Routines split off from VCDImager.
 
-$Id: NEWS,v 1.79 2005/09/17 01:42:55 rocky Exp $
+$Id: NEWS,v 1.80 2005/09/17 20:57:19 rocky Exp $
diff --git a/include/cdio/types.h b/include/cdio/types.h
index d889a467..3687ef6a 100644
--- a/include/cdio/types.h
+++ b/include/cdio/types.h
@@ -1,5 +1,5 @@
 /*
-    $Id: types.h,v 1.31 2005/03/21 10:43:08 rocky Exp $
+    $Id: types.h,v 1.32 2005/09/17 20:57:19 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -100,17 +100,17 @@ extern "C" {
 # endif
 #endif
   
-#if defined(HAVE_STDBOOL_H)
-#include <stdbool.h>
-#else
-  /* ISO/IEC 9899:1999 <stdbool.h> missing -- enabling workaround */
+#ifndef __cplusplus
+# if defined(HAVE_STDBOOL_H)
+#  include <stdbool.h>
+# else
+   /* ISO/IEC 9899:1999 <stdbool.h> missing -- enabling workaround */
   
-# ifndef __cplusplus
-#  define false   0
-#  define true    1
-#  define bool uint8_t
-# endif
-#endif
+#   define false   0
+#   define true    1
+#   define bool uint8_t
+# endif /*HAVE_STDBOOL_H*/
+#endif /*C++*/
   
   /* some GCC optimizations -- gcc 2.5+ */
   
diff --git a/lib/cdda_interface/Makefile.am b/lib/cdda_interface/Makefile.am
index 98fcd195..2afde4ae 100644
--- a/lib/cdda_interface/Makefile.am
+++ b/lib/cdda_interface/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.4 2005/02/05 16:25:51 rocky Exp $
+#   $Id: Makefile.am,v 1.5 2005/09/17 20:57:19 rocky Exp $
 #
 #    Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
@@ -44,7 +44,7 @@
 #     incompatibility with previous versions.
 
 libcdio_cdda_la_CURRENT := 0
-libcdio_cdda_la_REVISION := 0
+libcdio_cdda_la_REVISION := 1
 libcdio_cdda_la_AGE := 0
 
 noinst_HEADERS  = common_interface.h drive_exceptions.h low_interface.h \
diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am
index f9a82117..de497cd4 100644
--- a/lib/driver/Makefile.am
+++ b/lib/driver/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.12 2005/07/07 06:54:48 rocky Exp $
+#   $Id: Makefile.am,v 1.13 2005/09/17 20:57:19 rocky Exp $
 #
 #    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
@@ -43,7 +43,7 @@
 #     incompatibility with previous versions.
 
 libcdio_la_CURRENT := 6
-libcdio_la_REVISION := 0
+libcdio_la_REVISION := 1
 libcdio_la_AGE := 0
 
 EXTRA_DIST = image/Makefile FreeBSD/Makefile MSWindows/Makefile \
diff --git a/lib/iso9660/Makefile.am b/lib/iso9660/Makefile.am
index a1879882..2d111576 100644
--- a/lib/iso9660/Makefile.am
+++ b/lib/iso9660/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.7 2005/09/15 06:36:01 rocky Exp $
+#   $Id: Makefile.am,v 1.8 2005/09/17 20:57:19 rocky Exp $
 #
 #    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
@@ -43,7 +43,7 @@
 #     incompatibility with previous versions.
 
 libiso9660_la_CURRENT := 4
-libiso9660_la_REVISION := 0
+libiso9660_la_REVISION := 1
 libiso9660_la_AGE := 0
 
 EXTRA_DIST = libiso9660.sym