diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 0000000..1c9e77a
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,56 @@
+# This file was automatically generated by conda-smithy. To update a component of this
+# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run
+# "conda smithy rerender".
+
+environment:
+
+  BINSTAR_TOKEN:
+    # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
+    secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4
+
+  matrix:
+    - CONFIG: win_c_compilervs2008
+      CONDA_INSTALL_LOCN: C:\Miniconda36-x64
+
+    - CONFIG: win_c_compilervs2015
+      CONDA_INSTALL_LOCN: C:\Miniconda36-x64
+
+
+# We always use a 64-bit machine, but can build x86 distributions
+# with the TARGET_ARCH variable.
+platform:
+    - x64
+
+install:
+    # If there is a newer build queued for the same PR, cancel this one.
+    - cmd: |
+        powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
+        ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
+        del ff_ci_pr_build.py
+
+    # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.)
+    - cmd: rmdir C:\cygwin /s /q
+
+    # Add path, activate `conda` and update conda.
+    - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+    - cmd: conda.exe update --yes --quiet conda
+
+    - cmd: set PYTHONUNBUFFERED=1
+
+    # Add our channels.
+    - cmd: conda.exe config --set show_channel_urls true
+    - cmd: conda.exe config --remove channels defaults
+    - cmd: conda.exe config --add channels defaults
+    - cmd: conda.exe config --add channels conda-forge
+
+    # Configure the VM.
+    - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1
+    - cmd: run_conda_forge_build_setup
+
+# Skip .NET project specific build phase.
+build: off
+
+test_script:
+    - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
+deploy_script:
+    - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml
diff --git a/.ci_support/win_c_compilervs2008.yaml b/.ci_support/win_c_compilervs2008.yaml
new file mode 100644
index 0000000..3de2b54
--- /dev/null
+++ b/.ci_support/win_c_compilervs2008.yaml
@@ -0,0 +1,2 @@
+c_compiler:
+- vs2008
diff --git a/.ci_support/win_c_compilervs2015.yaml b/.ci_support/win_c_compilervs2015.yaml
new file mode 100644
index 0000000..f8b50c6
--- /dev/null
+++ b/.ci_support/win_c_compilervs2015.yaml
@@ -0,0 +1,2 @@
+c_compiler:
+- vs2015
diff --git a/README.md b/README.md
index 62881c3..84e0724 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Current build status
 
 [![Linux](https://img.shields.io/circleci/project/github/conda-forge/libtheora-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/libtheora-feedstock)
 [![OSX](https://img.shields.io/travis/conda-forge/libtheora-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/libtheora-feedstock)
-![Windows disabled](https://img.shields.io/badge/Windows-disabled-lightgrey.svg)
+[![Windows](https://img.shields.io/appveyor/ci/conda-forge/libtheora-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/libtheora-feedstock/branch/master)
 
 Current release info
 ====================
diff --git a/recipe/CMakeLists.txt b/recipe/CMakeLists.txt
index b509933..a36569c 100644
--- a/recipe/CMakeLists.txt
+++ b/recipe/CMakeLists.txt
@@ -47,7 +47,6 @@ set(THEORA_SRC
    lib/analyze.c
    lib/apiwrapper.c
    lib/bitpack.c
-   lib/collect.c
    lib/decapiwrapper.c
    lib/decinfo.c
    lib/decode.c
@@ -70,15 +69,13 @@ set(THEORA_SRC
    lib/rate.c
    lib/state.c
    lib/tokenize.c
-   lib/x86/mmxencfrag.c
-   lib/x86/mmxfdct.c
-   lib/x86/mmxfrag.c
-   lib/x86/mmxidct.c
-   lib/x86/mmxstate.c
-   lib/x86/sse2idct.c
-   lib/x86/x86cpu.c
-   lib/x86/x86enquant.c
-   lib/x86/x86state.c
+   lib/x86_vc/mmxencfrag.c
+   lib/x86_vc/mmxfdct.c
+   lib/x86_vc/mmxfrag.c
+   lib/x86_vc/mmxidct.c
+   lib/x86_vc/mmxstate.c
+   lib/x86_vc/x86enc.c
+   lib/x86_vc/x86state.c
 )
 
 add_library(THEORA SHARED
@@ -113,4 +110,4 @@ install(TARGETS THEORA
 file(GLOB INCLUDE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
 # Copy .h files to include dir.
 install(DIRECTORY ${THEORA_SOURCE_DIR}/include/theora DESTINATION include
-	FILES_MATCHING PATTERN "*.h")
\ No newline at end of file
+	FILES_MATCHING PATTERN "*.h")
diff --git a/recipe/bld.bat b/recipe/bld.bat
index cb91782..3fd7b64 100644
--- a/recipe/bld.bat
+++ b/recipe/bld.bat
@@ -7,7 +7,7 @@ mkdir build
 cd build
 
 :: Configure using the CMakeFiles
-%LIBRARY_BIN%\cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" -DCMAKE_BUILD_TYPE:STRING=Release .. 
+cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" -DCMAKE_BUILD_TYPE:STRING=Release ..
 if errorlevel 1 exit 1
 
 :: Build!
@@ -15,4 +15,4 @@ nmake
 if errorlevel 1 exit 1
 
 nmake install
-if errorlevel 1 exit 1
\ No newline at end of file
+if errorlevel 1 exit 1
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index e58ca1d..fe53720 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -10,12 +10,12 @@ source:
   sha256: b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
 
 build:
-    number: 1
-    skip: True  # [win]
+  number: 1
 
 requirements:
   build:
-    - pkg-config
+    - pkg-config           # [unix]
+    - cmake                # [win]
     - {{ compiler("c") }}
 
   host: