diff --git a/src/libs/portability/CMakeLists.txt b/src/libs/portability/CMakeLists.txt
index d077aae68..3756152c9 100644
--- a/src/libs/portability/CMakeLists.txt
+++ b/src/libs/portability/CMakeLists.txt
@@ -13,9 +13,11 @@ ENDIF(COMMAND CMAKE_POLICY)
 IF(WIN32)
 	# DLL export stuff under Windows (to avoid .def file)
 	ADD_DEFINITIONS(-DPORTABILITY_DLL)
-	set(PORTABILITY_SOURCES ${PORTABILITY_SOURCES} win32.cpp)
+	set(PORTABILITY_SOURCES ${PORTABILITY_SOURCES}
+		win32/rmdir_r.cpp)
 ELSEIF(UNIX)
-	set(PORTABILITY_SOURCES ${PORTABILITY_SOURCES} posix.cpp)
+	set(PORTABILITY_SOURCES ${PORTABILITY_SOURCES}
+		posix/rmdir_r.cpp)
 ENDIF(WIN32)
 
 # Note: Headers needed for having them available in IDEs.
diff --git a/src/libs/portability/posix.cpp b/src/libs/portability/posix/rmdir_r.cpp
similarity index 100%
rename from src/libs/portability/posix.cpp
rename to src/libs/portability/posix/rmdir_r.cpp
diff --git a/src/libs/portability/win32.cpp b/src/libs/portability/win32/rmdir_r.cpp
similarity index 100%
rename from src/libs/portability/win32.cpp
rename to src/libs/portability/win32/rmdir_r.cpp