diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 3c74660d628..4a15387b520 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -4,3 +4,7 @@ INSTALL(FILES qgis_global_settings.ini
         DESTINATION ${QGIS_DATA_DIR})
 INSTALL(DIRECTORY cpt-city-qgis-min DESTINATION ${QGIS_DATA_DIR}/resources)
 INSTALL(DIRECTORY themes DESTINATION ${QGIS_DATA_DIR}/resources)
+
+IF (WITH_SERVER)
+        INSTALL(DIRECTORY server DESTINATION ${QGIS_DATA_DIR}/resources)
+ENDIF (WITH_SERVER)
diff --git a/src/server/schemaExtension.xsd b/resources/server/schemaExtension.xsd
similarity index 100%
rename from src/server/schemaExtension.xsd
rename to resources/server/schemaExtension.xsd
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 7d88591251d..0dab0b90e03 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -203,6 +203,5 @@ INSTALL(TARGETS
 INSTALL(FILES
   admin.sld
   wms_metadata.xml
-  schemaExtension.xsd
   DESTINATION ${QGIS_CGIBIN_DIR}
 )