diff --git a/ChangeLog b/ChangeLog
index 7335abe..0c32c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2012-09-16  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+2012-09-17  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
 
         * Bug fix version 0.6.2 released
         ================================
@@ -6,6 +6,7 @@
         clang++ compiler precedence is only taken for Mac OS X >= 10.7
         Omit Python checks if Python bindings are disabled
         Enhance OpenMP configuration on Darwin
+        Export MACOSX_DEPLOYMENT_TARGET only for --enable-universalsdk
 
 2012-09-15  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
 
diff --git a/NEWS b/NEWS
index 549a757..718f2ac 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ New Features and Important Changes in GammaLib 00-06-02
 
 Author(s) : Juergen Knoedlseder
 
-September, 16th, 2012
+September, 17th, 2012
 
 
 1. Introduction
@@ -32,6 +32,13 @@ the appropriate code when needed.
 Furthermore, the OPENMP_LIB_LDFLAGS is not set to -lgomp on Darwin
 anymore as this appears not to be needed.
 
+The MACOSX_DEPLOYMENT_TARGET environment variable is now only exported
+when the --enable-universalsdk option is specified. This solved problems
+related to uncatched exceptions in unit tests. Possibly, these uncatched
+exceptions were due to weak linking, a feature that exists since Mac OS
+X version 10.2. By not exporting MACOSX_DEPLOYMENT_TARGET, Mac OS X
+version 10.1 is assumed.
+
 
 3. Application module
 ---------------------
diff --git a/README b/README
index 766848b..280084c 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 GammaLib information
 ====================
-Version: 00-06-02 (September 16th, 2012)
+Version: 00-06-02 (September 17th, 2012)
 Author:  Juergen Knoedlseder (jurgen.knodlseder@irap.omp.eu)
 
 
diff --git a/configure.ac b/configure.ac
index a89b27b..34bef83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,16 +387,17 @@ yes)
             ;;
         esac
 	    
-	    # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the 
-	    # environment with a value that is the same as what we'll use
-	    # in the Makefile to ensure that we'll get the same compiler
-	    # environment during configure and build time.
-	    MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
-	    export MACOSX_DEPLOYMENT_TARGET
-	    EXPORT_MACOSX_DEPLOYMENT_TARGET=''
-
         # Set compile, link and pre-processor flags dependent on architecture
 	    if test "${enable_universalsdk}"; then
+
+	        # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the 
+	        # environment with a value that is the same as what we'll use
+	        # in the Makefile to ensure that we'll get the same compiler
+	        # environment during configure and build time.
+	        MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
+	        export MACOSX_DEPLOYMENT_TARGET
+	        EXPORT_MACOSX_DEPLOYMENT_TARGET=''
+
 		    UNIVERSAL_ARCH_FLAGS=""
 	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
 		        UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"