diff --git a/cmake/Modules/FindDiscordRPC.cmake b/cmake/Modules/FindDiscordRPC.cmake
index b43221ab..e7176276 100644
--- a/cmake/Modules/FindDiscordRPC.cmake
+++ b/cmake/Modules/FindDiscordRPC.cmake
@@ -3,11 +3,11 @@ include(LibFindMacros)
 libfind_pkg_check_modules(DISCORDRPC_PKGCONF DISCORDRPC)
 
 find_path(DISCORDRPC_INCLUDE_DIR
-	NAMES discord-rpc.h
+	NAMES discord_rpc.h
 	PATHS
 		${DISCORDRPC_PKGCONF_INCLUDE_DIRS}
-		"/usr/include/discord-rpc"
-		"/usr/local/include/discord-rpc"
+		"/usr/include"
+		"/usr/local/include"
 )
 
 find_library(DISCORDRPC_LIBRARY
@@ -20,4 +20,4 @@ find_library(DISCORDRPC_LIBRARY
 
 set(DISCORDRPC_PROCESS_INCLUDES DISCORDRPC_INCLUDE_DIR)
 set(DISCORDRPC_PROCESS_LIBS DISCORDRPC_LIBRARY)
-libfind_process(DISCORDRPC)
\ No newline at end of file
+libfind_process(DISCORDRPC)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7cb9d119..507eaab2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -237,7 +237,7 @@ set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL
 ### use internal libraries?
 if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only
 	set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES OFF CACHE BOOL
-	"Use SRB2's internal copies of required dependencies (SDL2, PNG, zlib, GME).")
+	"Use SRB2Kart's internal copies of required dependencies (SDL2, PNG, zlib, GME).")
 endif()
 
 if(${SRB2_CONFIG_HAVE_BLUA})
@@ -359,17 +359,16 @@ if(${SRB2_CONFIG_HAVE_DISCORDRPC})
 			set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/lib -ldiscord-rpc")
 		endif()
 	else()
-		find_package(DISCORDRPC)
+		find_package(DiscordRPC)
 	endif()
 	if(${DISCORDRPC_FOUND})
 		set(SRB2_HAVE_DISCORDRPC ON)
 		add_definitions(-DHAVE_DISCORDRPC)
-		set(SRB2_DISCORDRPC_SOURCES
-			discord.c
-			discord.h
-		)
+		set(SRB2_DISCORDRPC_SOURCES discord.c)
+		set(SRB2_DISCORDRPC_HEADERS discord.h)
 		prepend_sources(SRB2_DISCORDRPC_SOURCES)
-		source_group("Discord Rich Presence" FILES ${SRB2_DISCORDRPC_SOURCES})
+		prepend_sources(SRB2_DISCORDRPC_HEADERS)
+		source_group("Discord Rich Presence" FILES ${SRB2_DISCORDRPC_SOURCES} ${SRB2_DISCORDRPC_HEADERS})
 	else()
 		message(WARNING "You have specified that Discord Rich Presence is available but it was not found.")
 	endif()
diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt
index 33c83b8b..f8d8f08d 100644
--- a/src/sdl/CMakeLists.txt
+++ b/src/sdl/CMakeLists.txt
@@ -70,6 +70,8 @@ if(${SDL2_FOUND})
 	set(SRB2_SDL2_TOTAL_SOURCES
 		${SRB2_CORE_SOURCES}
 		${SRB2_CORE_HEADERS}
+		${SRB2_DISCORDRPC_SOURCES}
+		${SRB2_DISCORDRPC_HEADERS}
 		${SRB2_PNG_SOURCES}
 		${SRB2_PNG_HEADERS}
 		${SRB2_CORE_RENDER_SOURCES}
@@ -86,9 +88,11 @@ if(${SDL2_FOUND})
 		${SRB2_PNG_SOURCES} ${SRB2_PNG_HEADERS})
 	source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
 	source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
+	source_group("Discord Rich Presence" FILES ${SRB2_DISCORDRPC_SOURCES} ${SRB2_DISCORDRPC_HEADERS})
 	source_group("Assembly" FILES ${SRB2_ASM_SOURCES} ${SRB2_NASM_SOURCES})
 	source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS})
 	source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS})
+	
 
 	if(${SRB2_CONFIG_HWRENDER})
 		set(SRB2_SDL2_TOTAL_SOURCES ${SRB2_SDL2_TOTAL_SOURCES}
@@ -153,6 +157,7 @@ if(${SDL2_FOUND})
 			${ZLIB_LIBRARIES}
 			${OPENGL_LIBRARIES}
 			${CURL_LIBRARIES}
+			${DISCORDRPC_LIBRARIES}
 		)
 		set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
 	else()
@@ -164,6 +169,7 @@ if(${SDL2_FOUND})
 			${ZLIB_LIBRARIES}
 			${OPENGL_LIBRARIES}
 			${CURL_LIBRARIES}
+			${DISCORDRPC_LIBRARIES}
 		)
 
 		if(${CMAKE_SYSTEM} MATCHES Linux)
@@ -244,6 +250,7 @@ if(${SDL2_FOUND})
 		${ZLIB_INCLUDE_DIRS}
 		${OPENGL_INCLUDE_DIRS}
 		${CURL_INCLUDE_DIRS}
+		${DISCORDRPC_INCLUDE_DIRS}
 	)
 
 	if(${SRB2_HAVE_MIXER})
@@ -328,6 +335,10 @@ if(${SDL2_FOUND})
 			getwinlib(libgme "libgme.dll")
 		endif()
 
+		if(${SRB2_CONFIG_HAVE_DISCORDRPC})
+			getwinlib(libgme "discord-rpc.dll")
+		endif()
+
 		install(PROGRAMS
 			${win_extra_dll_list}
 			DESTINATION .