diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc6f45a59..514175e9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,11 @@ else()
 endif()
 
 set(BUILD_CLIENT 1 CACHE BOOL "Build client")
-set(BUILD_SERVER 1 CACHE BOOL "Build server")
+if(WIN32)
+	set(BUILD_SERVER 0 CACHE BOOL "Build server")
+else()
+	set(BUILD_SERVER 1 CACHE BOOL "Build server")
+endif()
 
 set(WARN_ALL 1 CACHE BOOL "Enable -Wall for Release build")
 
@@ -60,6 +64,7 @@ elseif(UNIX) # Linux, BSD etc
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
 #
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9bb266784..4d51f7104 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,7 +130,7 @@ set(common_SRCS
 
 # This gives us the icon
 if(WIN32 AND MSVC)
-    set(common_SRCS ${common_SRCS} winresource.rc)
+	set(common_SRCS ${common_SRCS} winresource.rc)
 endif()
 
 # Client sources