diff --git a/THANKS b/THANKS
index 86fa535a..387af33b 100644
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ Christian Dywan <christian@twotoasts.de>
 Timo Kluck <tkluck@infty.nl>
 Charles Lindsay <chaz@yorba.org>
 Mario Sanchez Prada <msanchez@igalia.com>
+Didier Roche <didrocks@ubuntu.com>
 Michel Alexandre Salim <salimma@fedoraproject.org>
 Robert Schroll <rschroll@gmail.com>
 
diff --git a/cmake/ValaPrecompile.cmake b/cmake/ValaPrecompile.cmake
index 7d015391..89b5bb85 100644
--- a/cmake/ValaPrecompile.cmake
+++ b/cmake/ValaPrecompile.cmake
@@ -152,11 +152,15 @@ macro(vala_precompile output source_bundle_name)
     set(custom_vapi_arguments "")
     if(ARGS_CUSTOM_VAPIS)
         foreach(vapi ${ARGS_CUSTOM_VAPIS})
-            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+            SET(_srcdir_regexp "${CMAKE_SOURCE_DIR}")
+            SET(_bindir_regexp "${CMAKE_BINARY_DIR}")
+            STRING(REGEX REPLACE "\\+" "\\\\+" _srcdir_regexp "${_srcdir_regexp}")
+            STRING(REGEX REPLACE "\\+" "\\\\+" _bindir_regexp "${_bindir_regexp}")
+            if(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
                 list(APPEND custom_vapi_arguments ${vapi})
-            else(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+            else(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
                 list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
-            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+            endif(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
         endforeach(vapi ${ARGS_CUSTOM_VAPIS})
     endif(ARGS_CUSTOM_VAPIS)