diff --git a/src/XrdS3/CMakeLists.txt b/src/XrdS3/CMakeLists.txt
index 254c923a91d..0df1aada8ba 100644
--- a/src/XrdS3/CMakeLists.txt
+++ b/src/XrdS3/CMakeLists.txt
@@ -1,21 +1,20 @@
+#-----------------------------------------------------------------------------
+# xrootd-s3@s3 systemd unit
+#-----------------------------------------------------------------------------
 set(XS3_SYSTEMD_SERVICE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/systemd/xrootd-s3@.service")
-
 install(FILES ${XS3_SYSTEMD_SERVICE_FILE}
         DESTINATION /lib/systemd/system)
 
-set(XS3_CONFIG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/config/xrootd-s3.cfg")
 
+#-----------------------------------------------------------------------------
+# /etc/xrootd/xrootd-s3.cfg
+#-----------------------------------------------------------------------------
+set(XS3_CONFIG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/config/xrootd-s3.cfg")
 install(FILES ${XS3_CONFIG_FILE}
         DESTINATION /etc/xrootd/)
 
-
 #-----------------------------------------------------------------------------
-# xs3
+# xrds3
 #-----------------------------------------------------------------------------
-#add_executable(
-#  xrds3
-#  app/xs3.cc )
-
-#target_link_libraries(
-#  xrds3
-#  ${JSONCPP_LIBRARIES} uuid stdc++fs XrdUtils )
+set(XS3_APP_FILE "${CMAKE_CURRENT_SOURCE_DIR}/app/xrds3")
+install(PROGRAMS ${XS3_APP_FILE} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})