diff --git a/ports/libtheora/CMakeLists.txt b/ports/libtheora/CMakeLists.txt
index c11adc21ce48dd..d06172b632074e 100644
--- a/ports/libtheora/CMakeLists.txt
+++ b/ports/libtheora/CMakeLists.txt
@@ -11,6 +11,25 @@ file(GLOB HEADERS
   "include/theora/theoraenc.h"
 )
 
+if(MSVC)
+  set(LIBTHEORA_COMMON_X86
+    "lib/x86_vc/mmxfrag.c"
+    "lib/x86_vc/mmxidct.c"
+    "lib/x86_vc/mmxstate.c"
+    "lib/x86_vc/x86cpu.c"
+    "lib/x86_vc/x86state.c"
+  )
+else()
+  set(LIBTHEORA_COMMON_X86
+    "lib/x86/mmxfrag.c"
+    "lib/x86/mmxidct.c"
+    "lib/x86/mmxstate.c"
+    "lib/x86/sse2idct.c"
+    "lib/x86/x86cpu.c"
+    "lib/x86/x86state.c"
+  )
+endif()
+
 set(LIBTHEORA_COMMON
   "lib/apiwrapper.c"
   "lib/bitpack.c"
@@ -22,13 +41,25 @@ set(LIBTHEORA_COMMON
   "lib/state.c"
   "lib/quant.c"
 
-  "lib/x86_vc/mmxfrag.c"
-  "lib/x86_vc/mmxidct.c"
-  "lib/x86_vc/mmxstate.c"
-  "lib/x86_vc/x86cpu.c"
-  "lib/x86_vc/x86state.c"
+  ${LIBTHEORA_COMMON_X86}
 )
 
+if(MSVC)
+  set(LIBTHEORA_ENC_X86
+    "lib/x86_vc/mmxencfrag.c"
+    "lib/x86_vc/mmxfdct.c"
+    "lib/x86_vc/x86enc.c"
+  )
+else()
+  set(LIBTHEORA_ENC_X86
+    "lib/x86/mmxencfrag.c"
+    "lib/x86/mmxfdct.c"
+    "lib/x86/x86enc.c"
+    "lib/x86/x86enquant.c"
+    "lib/x86/sse2encfrag.c"
+  )
+endif()
+
 set(LIBTHEORA_ENC
   "lib/analyze.c"
   "lib/encapiwrapper.c"
@@ -43,9 +74,7 @@ set(LIBTHEORA_ENC
   "lib/rate.c"
   "lib/tokenize.c"
 
-  "lib/x86_vc/mmxencfrag.c"
-  "lib/x86_vc/mmxfdct.c"
-  "lib/x86_vc/x86enc.c"
+  ${LIBTHEORA_ENC_X86}
 )
 
 set(LIBTHEORA_DEC
diff --git a/ports/libtheora/vcpkg.json b/ports/libtheora/vcpkg.json
index 17f4ccdf9923c5..1848ab8fe8803b 100644
--- a/ports/libtheora/vcpkg.json
+++ b/ports/libtheora/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libtheora",
   "version-string": "1.2.0alpha1-20170719",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Theora is a free and open video compression format from the Xiph.org Foundation.",
   "homepage": "https://github.com/xiph/theora",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index fcb2c4360e493a..e1154251b25eb0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4270,7 +4270,7 @@
     },
     "libtheora": {
       "baseline": "1.2.0alpha1-20170719",
-      "port-version": 4
+      "port-version": 5
     },
     "libtins": {
       "baseline": "4.3",
diff --git a/versions/l-/libtheora.json b/versions/l-/libtheora.json
index 4fba0ff535c709..ab8500df2f2965 100644
--- a/versions/l-/libtheora.json
+++ b/versions/l-/libtheora.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ee3ae063e330da252b75c91b2b8a4a9392fc8a46",
+      "version-string": "1.2.0alpha1-20170719",
+      "port-version": 5
+    },
     {
       "git-tree": "77e6aad4fc7e821831290f3e17d368ea17609117",
       "version-string": "1.2.0alpha1-20170719",