diff --git a/TODO b/TODO
new file mode 100644
index 00000000..c2db3cd1
--- /dev/null
+++ b/TODO
@@ -0,0 +1,4 @@
+A proposed list of problems.
+
+20110404	shall set up a fallback (./configure-backed) scheme when the mangling scheme does not get guessed by ./configure;  
+
diff --git a/base/modules/fakempi.c b/base/modules/fakempi.c
index f68b107e..3ba717c9 100644
--- a/base/modules/fakempi.c
+++ b/base/modules/fakempi.c
@@ -2,6 +2,22 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifndef LowerUnderscore
+#ifndef LowerDoubleUnderscore
+#ifndef LowerCase
+#ifndef UpperUnderscore
+#ifndef UpperDoubleUnderscore 
+#ifndef UpperCase
+#define LowerUnderscore 1  /* 20110404 the default */
+/* #error "should specify a default mangling scheme" */
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+
+
 #ifdef LowerUnderscore
 #define mpi_wtime       mpi_wtime_
 #define mpi_send        mpi_send_