diff --git a/.gitmodules b/.gitmodules
index b2afcdb8f..93dea8a0f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,6 @@
 [submodule "plugins/mac-syphon/syphon-framework"]
 	path = plugins/mac-syphon/syphon-framework
 	url = https://github.com/palana/Syphon-Framework.git
+[submodule "plugins/enc-amf"]
+	path = plugins/enc-amf
+	url = https://github.com/Xaymar/OBS-AMD-Advanced-Media-Framework.git
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index e6966589a..193cdb985 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -11,6 +11,14 @@ if(WIN32)
 	add_subdirectory(win-mf)
 	add_subdirectory(obs-qsv11)
 	add_subdirectory(vlc-video)
+	option(BUILD_AMF_ENCODER "Build AMD Advanced Media Framework encoder module" OFF)
+	if (BUILD_AMF_ENCODER)
+		if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/enc-amf/CMakeLists.txt")
+			add_subdirectory(enc-amf)
+		else()
+			message(STATUS "enc-amf submodule not found!  Please fetch submodules.  enc-amf plugin disabled.")
+		endif()
+	endif()
 elseif(APPLE)
 	add_subdirectory(coreaudio-encoder)
 	add_subdirectory(mac-avcapture)
diff --git a/plugins/enc-amf b/plugins/enc-amf
new file mode 160000
index 000000000..33f2581a0
--- /dev/null
+++ b/plugins/enc-amf
@@ -0,0 +1 @@
+Subproject commit 33f2581a061cfc674f54e2a2ef5f8ab8a87890c8