diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94bbc0c..ba2dc3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,7 +135,7 @@ IF(WIN32)
   SET(RC_INTERNAL_NAME "${PACKAGE_NAME} ${WIN32_MODE}")
   SET(RC_ORIGINAL_NAME ${PACKAGE_NAME}.dll)
   SET(RC_FILE_TYPE VFT_DLL)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/windows/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/windows/libnfc.rc @ONLY)
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/windows/libnfc.rc @ONLY)
 ENDIF(WIN32)
 
 ADD_SUBDIRECTORY(libnfc)
diff --git a/windows/win32/nfc.def b/contrib/win32/nfc.def
similarity index 100%
rename from windows/win32/nfc.def
rename to contrib/win32/nfc.def
diff --git a/windows/version.rc.in b/contrib/win32/version.rc.in
similarity index 100%
rename from windows/version.rc.in
rename to contrib/win32/version.rc.in
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 1153f2d..4c8cf0b 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -21,7 +21,7 @@ FOREACH(source ${EXAMPLES-SOURCES})
     SET(RC_INTERNAL_NAME ${source})
     SET(RC_ORIGINAL_NAME ${source}.exe)
     SET(RC_FILE_TYPE VFT_APP)
-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../windows/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc @ONLY)
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc @ONLY)
     LIST(APPEND TARGETS ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc)
   ENDIF(WIN32)
 
diff --git a/libnfc/CMakeLists.txt b/libnfc/CMakeLists.txt
index 82127ac..fdfca79 100644
--- a/libnfc/CMakeLists.txt
+++ b/libnfc/CMakeLists.txt
@@ -65,8 +65,8 @@ IF(WIN32)
 
   ADD_CUSTOM_COMMAND(
     OUTPUT libnfc.lib
-    COMMAND dlltool -d ${CMAKE_CURRENT_SOURCE_DIR}/../windows/win32/nfc.def -l ${CMAKE_CURRENT_BINARY_DIR}/libnfc.lib ${CMAKE_CURRENT_BINARY_DIR}/libnfc.dll
-    DEPENDS nfc ${CMAKE_CURRENT_SOURCE_DIR}/../windows/win32/nfc.def
+    COMMAND dlltool -d ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/nfc.def -l ${CMAKE_CURRENT_BINARY_DIR}/libnfc.lib ${CMAKE_CURRENT_BINARY_DIR}/libnfc.dll
+    DEPENDS nfc ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/nfc.def
   )
   ADD_CUSTOM_TARGET(win32lib ALL DEPENDS libnfc.lib)
 
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 402b893..b00411f 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -22,7 +22,7 @@ FOREACH(source ${UTILS-SOURCES})
     SET(RC_INTERNAL_NAME ${source})
     SET(RC_ORIGINAL_NAME ${source}.exe)
     SET(RC_FILE_TYPE VFT_APP)
-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../windows/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc @ONLY)
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc @ONLY)
     LIST(APPEND TARGETS ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc)
   ENDIF(WIN32)