diff --git a/common/ChangeLog b/common/ChangeLog
index 4889db4ec..6d408ba4f 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-11  Werner Koch  <wk@gnupg.org>
+
+	* dynload.h [__MINGW32__]: Define RTLD_LAZY.
+
+2004-03-09  Werner Koch  <wk@gnupg.org>
+
+	* maperror.c (map_assuan_err): Map the Locale_Problem item.
+
 2004-03-03  Werner Koch  <wk@gnupg.org>
 
 	* asshelp.c, asshelp.h: New.
diff --git a/common/dynload.h b/common/dynload.h
index d2df5f017..3c4652091 100644
--- a/common/dynload.h
+++ b/common/dynload.h
@@ -25,6 +25,8 @@
 #else
 #include <windows.h>
 
+#define RTLD_LAZY 0
+
 static __inline__ void *
 dlopen (const char * name, int flag)
 {
diff --git a/common/maperror.c b/common/maperror.c
index b04ec0bb3..2f6f1b159 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -72,9 +72,7 @@ map_assuan_err (int err)
     case ASSUAN_Not_Confirmed:   ec = GPG_ERR_NOT_CONFIRMED; break;
     case ASSUAN_Invalid_Id:      ec = GPG_ERR_INV_ID; break;
 
-#if 0 /* FIXME: Enable this after releasing libgpg error 0.7 */
     case ASSUAN_Locale_Problem:  ec = GPG_ERR_LOCALE_PROBLEM; break;
-#endif
 
     default:
       ec = err < 100? GPG_ERR_ASSUAN_SERVER_FAULT : GPG_ERR_ASSUAN;