diff --git a/.travis.yml b/.travis.yml
index b0322f4..565c1f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,23 @@
 language: rust
+cache: cargo
+
 rust:
   - stable
   - beta
   - nightly
   - 1.14.0
-cache: cargo
+os:
+ - linux
+ - windows
+
+matrix:
+  # rand 0.4 actually needs Rust 1.22, which leads to build failures on Rust 1.14 on Windows.
+  # This is not a problem, because
+  #  - we insist on rust 1.14 only for Debian, and
+  #  - "rand" is only an optional dependency.
+  exclude:
+  - rust: 1.14.0
+    os: windows
 
 script:
   - cargo build --verbose --features=fuzztarget
diff --git a/build.rs b/build.rs
index d105ada..c3d2486 100644
--- a/build.rs
+++ b/build.rs
@@ -50,7 +50,7 @@ fn main() {
     base_config.include("depend/secp256k1/")
                .include("depend/secp256k1/include")
                .include("depend/secp256k1/src")
-               .flag("-g")
+               .debug(true)
                .flag_if_supported("-Wno-unused-function") // some ecmult stuff is defined but not used upstream
                .define("SECP256K1_BUILD", Some("1"))
                // TODO these three should be changed to use libgmp, at least until secp PR 290 is merged