diff --git a/checkin_notes b/checkin_notes
index ededa57fde..fbf7888a21 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6952,3 +6952,11 @@ David  22 May 2005
 
     api/
         boinc_api.C
+
+Rom    23 May 2005
+    - Modify the configure.ac script to explicitly state which combination
+        of wxWidget libraries we need to link against, otherwise it will
+        fall back to a default which may cause more harm than good.
+
+    /
+        configure.ac
diff --git a/configure.ac b/configure.ac
index e84f17c003..fe295fb5c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,12 +361,21 @@ AM_OPTIONS_WXCONFIG
 
 dnl check for wxWidgets
 
-if test "${enable_debug}" = yes ; then
-    AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --debug)
+if test "${enable_client_release}" = yes ; then
+    if test "${enable_debug}" = yes ; then
+        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=yes)
+    else
+        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=no)
+    fi
 else
-    AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0])
+    if test "${enable_debug}" = yes ; then
+        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=yes)
+    else
+        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=no)
+    fi
 fi
 
+
 if ( test "${enable_client}" = yes ) && ( test "$wxWin" != 1 ); then
    AC_MSG_WARN([
 ================================================================================