diff --git a/src/secp256k1/.travis.yml b/src/secp256k1/.travis.yml
--- a/src/secp256k1/.travis.yml
+++ b/src/secp256k1/.travis.yml
@@ -1,4 +1,5 @@
 language: c
+os: linux
 addons:
   apt:
     packages:
@@ -64,4 +65,3 @@
 script:
  - ./travis/build_autotools.sh
  - ./travis/build_cmake.sh
-os: linux
diff --git a/src/secp256k1/CMakeLists.txt b/src/secp256k1/CMakeLists.txt
--- a/src/secp256k1/CMakeLists.txt
+++ b/src/secp256k1/CMakeLists.txt
@@ -137,7 +137,12 @@
 option(SECP256K1_ECMULT_STATIC_PRECOMPUTATION "Precompute libsecp256k1's elliptic curve multiplication tables" ON)
 if(SECP256K1_ECMULT_STATIC_PRECOMPUTATION)
 	set(USE_ECMULT_STATIC_PRECOMPUTATION 1)
+	set(SECP256K1_ECMULT_WINDOW_SIZE 15 CACHE STRING "Window size for ecmult precomputation for verification, specified as integer in range [2..24].")
+	if(${SECP256K1_ECMULT_WINDOW_SIZE} LESS 2 OR ${SECP256K1_ECMULT_WINDOW_SIZE} GREATER 24)
+		message(FATAL_ERROR "SECP256K1_ECMULT_WINDOW_SIZE must be an integer in range [2..24]")
+	endif()
 
+	# FIXME: Propagate SECP256K1_ECMULT_WINDOW_SIZE
 	include(NativeExecutable)
 	add_native_executable(gen_context src/gen_context.c)
 
diff --git a/src/secp256k1/src/libsecp256k1-config.h.cmake.in b/src/secp256k1/src/libsecp256k1-config.h.cmake.in
--- a/src/secp256k1/src/libsecp256k1-config.h.cmake.in
+++ b/src/secp256k1/src/libsecp256k1-config.h.cmake.in
@@ -22,6 +22,7 @@
 #cmakedefine USE_ASM_X86_64
 
 #cmakedefine USE_ECMULT_STATIC_PRECOMPUTATION
+#define ECMULT_WINDOW_SIZE ${SECP256K1_ECMULT_WINDOW_SIZE}
 
 #cmakedefine ENABLE_MODULE_ECDH
 #cmakedefine ENABLE_MODULE_MULTISET