diff --git a/ChangeLog b/ChangeLog
index dcf8b253e..2ff3644f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-03  Holger Vogt
+ * main.c: remove reference to 'oflag'
+ * ngspice.h: NaN definition for MS VS
+
 2011-07-03  Robert Larice
  * man/man1/ngnutmeg.1 ,
  * man/man1/ngspice.1 :
diff --git a/src/include/ngspice.h b/src/include/ngspice.h
index 1490f0e20..4ef0aeadc 100644
--- a/src/include/ngspice.h
+++ b/src/include/ngspice.h
@@ -173,6 +173,11 @@
 #define strcasecmp _stricmp
 #define snprintf _snprintf
 #define inline __inline
+/* NAN not available in MS VS 2008 */
+#ifndef NAN
+    static const __int64 global_nan = 0x7ff8000000000000i64;
+    #define NAN (*(const double *) global_nan)
+#endif
 #endif
 
 
diff --git a/src/main.c b/src/main.c
index f8bcba44f..c7773bfcb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1004,7 +1004,7 @@ main(int argc, char **argv)
             perror (log_file);
             sp_shutdown (EXIT_BAD);
         }
-        oflag = TRUE; /* All further output to -o log file */
+//        oflag = TRUE; /* All further output to -o log file */
 #else
         /* Connect stdout to file log_file and log stdout */
         if (!freopen (log_file, "w", stdout)) {