diff --git a/.travis.yml b/.travis.yml
index 453bfc1..f274381 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,14 +16,6 @@ matrix:
       sudo: required
       env: TARGET_CPU=x64 CMAKE_BUILD_TYPE=Debug
 
-    - os: osx
-      osx_image: xcode7.3
-      env: TARGET_CPU=x86
-
-    - os: osx
-      osx_image: xcode7.3
-      env: TARGET_CPU=x86 CMAKE_BUILD_TYPE=Debug
-
     - os: osx
       osx_image: xcode7.3
       env: TARGET_CPU=x64
@@ -70,7 +62,7 @@ install:
 - git submodule update
 - mkdir out
 - cd out
-- cmake -DTARGET_CPU=$TARGET_CPU ..
+- cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DTARGET_CPU=$TARGET_CPU ..
 
 script:
 - make -j 4 package
@@ -84,9 +76,7 @@ deploy:
     - libwebrtc-$TRAVIS_TAG-linux-x64.tar.gz
     - libwebrtc-$TRAVIS_TAG-linux-x86-debug.tar.gz
     - libwebrtc-$TRAVIS_TAG-linux-x64-debug.tar.gz
-    - libwebrtc-$TRAVIS_TAG-mac-x86.tar.gz
     - libwebrtc-$TRAVIS_TAG-mac-x64.tar.gz
-    - libwebrtc-$TRAVIS_TAG-mac-x86-debug.tar.gz
     - libwebrtc-$TRAVIS_TAG-mac-x64-debug.tar.gz
   skip_cleanup: true
   overwrite: true
diff --git a/README.md b/README.md
index dd98847..c0a492d 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ supported platforms and architectures.
   </tr>
   <tr>
     <th align="center">macOS</th>
-    <td></td>
+    <td align="center">-</td>
     <td align="center">✔</td>
     <td align="center">-</td>
     <td align="center">-</td>
diff --git a/appveyor.yml b/appveyor.yml
index ca28512..224d413 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,23 +3,13 @@ os: Visual Studio 2015
 matrix:
   fast_finish: true
 
-environment:
-  matrix:
-    - platform: x86
-      configuration: Debug
-      CMAKE_GENERATOR: "Visual Studio 14 2015"
+platform:
+  - x86
+  - x64
 
-    - platform: x86
-      configuration: Release
-      CMAKE_GENERATOR: "Visual Studio 14 2015"
-
-    - platform: x64
-      configuration: Debug
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
-
-    - platform: x64
-      configuration: Release
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
+configuration:
+  - Debug
+  - Release
 
 clone_folder: c:\projects\libwebrtc
 
@@ -28,20 +18,21 @@ build:
 
 before_build:
   - cd c:\projects\libwebrtc
-  - git submodule update --init --recursive
-  - cmake -G %CMAKE_GENERATOR% -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc .
+  - if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015
+  - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64
+  - cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc .
 
 artifacts:
-  - path: libwebrtc-0.0.1-rc.4-win-x86-debug.zip
-    name: libwebrtc-0.0.1-rc.4-win-x86-debug.zip
-
   - path: libwebrtc-0.0.1-rc.4-win-x86.zip
     name: libwebrtc-0.0.1-rc.4-win-x86.zip
 
-  - path: libwebrtc-0.0.1-rc.4-win-x64-debug.zip
-    name: libwebrtc-0.0.1-rc.4-win-x64-debug.zip
+  - path: libwebrtc-0.0.1-rc.4-win-x86-debug.zip
+    name: libwebrtc-0.0.1-rc.4-win-x86-debug.zip
 
   - path: libwebrtc-0.0.1-rc.4-win-x64.zip
     name: libwebrtc-0.0.1-rc.4-win-x64.zip
 
+  - path: libwebrtc-0.0.1-rc.4-win-x64-debug.zip
+    name: libwebrtc-0.0.1-rc.4-win-x64-debug.zip
+
 test: off