diff --git a/CMakeLists.txt b/CMakeLists.txt
index a856f8b6..7daf9fa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 PROJECT( exiv2 )
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )
@@ -26,7 +27,7 @@ OPTION( EXIV2_ENABLE_SHARED        "Build exiv2 as a shared library (dll)"
 OPTION( EXIV2_ENABLE_XMP           "Build with XMP metadata support"                       ON  )
 OPTION( EXIV2_ENABLE_LIBXMP        "Build a static convenience Library for XMP"            ON  )
 OPTION( EXIV2_ENABLE_PNG           "Build with png support (requires libz)"                ON  )
-OPTION( EXIV2_ENABLE_NLS           "Build native language support (requires gettext)"      OFF )
+OPTION( EXIV2_ENABLE_NLS           "Build native language support (requires gettext)"      ON  )
 OPTION( EXIV2_ENABLE_PRINTUCS2     "Build with Printucs2"                                  ON  )
 OPTION( EXIV2_ENABLE_LENSDATA      "Build including lens data"                             ON  )
 OPTION( EXIV2_ENABLE_COMMERCIAL    "Build with the EXV_COMMERCIAL_VERSION symbol set"      OFF )
diff --git a/TODO-CMAKE b/TODO-CMAKE
index 0b38be2b..46063d3d 100644
--- a/TODO-CMAKE
+++ b/TODO-CMAKE
@@ -1,7 +1,7 @@
 Current Status
 
-ToDo: * Find and link iconv library on Windows
-      * Polish/improve out of source builds
+ToDo: * Fix out of source builds for NMake
+      * Find and link iconv library on Windows
       * Test Cygwin, MinGW, Xcode, NMake and more versions of MSVC
       * Revisit searching for zlib, expat and iconv
       * Work on the "inherited from Gilles" list below
diff --git a/config/config.h.cmake b/config/config.h.cmake
index e8d46f05..84f7b2a2 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -15,7 +15,7 @@
 #cmakedefine EXV_HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the <libintl.h> header file. */
-#cmakedefine EXV_HAVE_LIBINTL_H 0
+#cmakedefine EXV_HAVE_LIBINTL_H 1
 
 #ifndef EXV_COMMERCIAL_VERSION
 
@@ -24,10 +24,10 @@
 
 /* Define to 1 if translation of program messages to the user's
    native language is requested. */
-#cmakedefine EXV_ENABLE_NLS 0
+#cmakedefine EXV_ENABLE_NLS 1
 
 /* Define to 1 if you have the `iconv' function. */
-#cmakedefine EXV_HAVE_ICONV 0
+#cmakedefine EXV_HAVE_ICONV 1
 
 /* Define to 1 to enable conversion of UCS2 encoded Windows tags to UTF-8. */
 #cmakedefine EXV_HAVE_PRINTUCS2 1
@@ -43,7 +43,7 @@
 #endif
 
 /* Define to 1 if you have the <libintl.h> header file. */
-#cmakedefine EXV_HAVE_LIBINTL_H 0
+#cmakedefine EXV_HAVE_LIBINTL_H 1
 
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fbf69bf0..b46911f2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -234,6 +234,8 @@ IF( ICONV_FOUND )
 	TARGET_LINK_LIBRARIES( exiv2lib ${ICONV_LIBRARIES} )
 ENDIF( ICONV_FOUND )
 
+##
+# copy header files (TODO: rewrite for NMake)
 IF (MSVC )
 	if (OUT_OF_SOURCE) 
 	    ADD_CUSTOM_COMMAND(
@@ -251,7 +253,7 @@ IF (MSVC )
 ENDIF()
 
 ##
-# copy zlib and expat dlls to output directory if necessary
+# copy zlib and expat dlls to output directory (TODO: rewrite for NMake)
 IF ( MSVC AND EXIV2_ENABLE_SHARED )
 	if (OUT_OF_SOURCE) 
 	    ADD_CUSTOM_COMMAND(