diff --git a/gdal/frmts/ogdi/makefile.vc b/gdal/frmts/ogdi/makefile.vc
index d2b931359572..e52fc58616d2 100644
--- a/gdal/frmts/ogdi/makefile.vc
+++ b/gdal/frmts/ogdi/makefile.vc
@@ -4,7 +4,8 @@ OBJ	=	ogdidataset.obj
 GDAL_ROOT	=	..\..
 
 EXTRAFLAGS	=	-I$(OGDIDIR)/ogdi/include -I$(OGDIDIR)/include/win32 \
-			-I$(OGDIDIR)/proj -DWIN32 -D_WINDOWS
+			-I$(OGDIDIR)/include/ogdi \
+			-I$(OGDIDIR)/include -DWIN32 -D_WINDOWS
 
 !INCLUDE $(GDAL_ROOT)\nmake.opt
 
diff --git a/gdal/nmake.opt b/gdal/nmake.opt
index f0e8c0631fa4..b69154c21656 100644
--- a/gdal/nmake.opt
+++ b/gdal/nmake.opt
@@ -181,10 +181,10 @@ INCLUDE_OGR_FRMTS = YES
 # const or leave it empty. Take a look on your iconv() declaration in iconv.h.
 # If the second parameter declared as const char** then you need to define
 # ICONV_CONST=const otherwise leave it empty.
-#LIBICONV_DIR = "C:\Program Files\GnuWin32"
-#LIBICONV_INCLUDE = -I$(LIBICONV_DIR)\include
-#LIBICONV_LIBRARY = $(LIBICONV_DIR)\lib\libiconv.lib
-#LIBICONV_CFLAGS = -DICONV_CONST=const
+LIBICONV_DIR = "C:\OSGeo4W"
+LIBICONV_INCLUDE = -I$(LIBICONV_DIR)\include
+LIBICONV_LIBRARY = $(LIBICONV_DIR)\lib\iconv.lib
+LIBICONV_CFLAGS = -DICONV_CONST=const
 
 # Comment out the following to disable BSB support.
 BSB_SUPPORTED = 1
diff --git a/gdal/ogr/ogrsf_frmts/ogdi/makefile.vc b/gdal/ogr/ogrsf_frmts/ogdi/makefile.vc
index d40cb98d372e..cc842a0b1524 100644
--- a/gdal/ogr/ogrsf_frmts/ogdi/makefile.vc
+++ b/gdal/ogr/ogrsf_frmts/ogdi/makefile.vc
@@ -2,8 +2,8 @@
 OBJ	=	ogrogdidriver.obj ogrogdidatasource.obj ogrogdilayer.obj
 
 EXTRAFLAGS =	-I.. -I..\.. \
-		-I$(OGDIDIR)/ogdi/include -I$(OGDIDIR)/include/win32 \
-		-I$(OGDIDIR)/proj -DWIN32 -D_WINDOWS
+		-I$(OGDIDIR)/include/ogdi -I$(OGDIDIR)/include/win32 \
+		-I$(OGDIDIR)/proj -I(OGDIDIR)/include -DWIN32 -D_WINDOWS
 
 GDAL_ROOT	=	..\..\..
 
diff --git a/gdal/swig/python/fallback_build.bat b/gdal/swig/python/fallback_build.bat
index 66fc240a6bff..5daad677550a 100755
--- a/gdal/swig/python/fallback_build.bat
+++ b/gdal/swig/python/fallback_build.bat
@@ -5,8 +5,8 @@ rem that "python setup.py build" has already created the build/lib... directory
 rem and copied in the appropriate .py files.
 rem
 
-set PYTHONHOME=C:\OSGeo4W\apps\Python25
-set OUTDIR=build\lib.win32-2.5\osgeo
+set PYTHONHOME=C:\OSGeo4W\apps\Python27
+set OUTDIR=build\lib.win32-2.7\osgeo
 
 set CLARGS=/c /nologo /Ox /MD /EHsc /DNDEBUG -I../../port -I../../gcore -I../../alg -I../../ogr/ -I%PYTHONHOME%\include -I%PYTHONHOME%\PC -I%PYTHONHOME%\lib\site-packages\numpy\core\include