diff --git a/ChangeLog b/ChangeLog
index 44184971b..c22d326ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-05  Robert Larice
+ * src/include/ngspice.h :
+   disable Visual Studio "warning: C4127: conditional expression is constant"
+
 2011-08-05  Robert Larice
  * src/maths/cmaths/cmath2.c :
    rewrite to fix potential (actuall impossible) usage of variable `c'
diff --git a/src/include/ngspice.h b/src/include/ngspice.h
index a92e1e1b1..4924256cb 100644
--- a/src/include/ngspice.h
+++ b/src/include/ngspice.h
@@ -178,6 +178,8 @@
     static const __int64 global_nan = 0x7ff8000000000000i64;
     #define NAN (*(const double *) &global_nan)
 #endif
+// warning C4127: Bedingter Ausdruck ist konstant
+#pragma warning(disable: 4127)
 #endif